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

[git version control]

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

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Tue Jun  9 10:40:18 2009 +0100

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

Conflicts:
	recipes/e17/expedite_svn.bb
	recipes/gtk-webcore/midori_git.bb
	recipes/u-boot/u-boot_git.bb

---