[oe-commits] Graeme Gregory : Merge branch 'org.openembedded.dev' of git+ssh://git at git. openembedded.net/openembedded into xora/angstrom-srcpv

[GIT User account]

Module: openembedded.git
Branch: xora/angstrom-srcpv
Commit: 6ad6ef9f4d1d46a3cf6786c1e20c81b37c2e4eb8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6ad6ef9f4d1d46a3cf6786c1e20c81b37c2e4eb8

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Sun May 17 00:08:53 2009 +0100

Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.net/openembedded into xora/angstrom-srcpv

Conflicts:
	recipes/webkit/webkit-gtk_svn.bb

---