[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: 5147d3253a8320c2484c78d686404fad18fbb30f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5147d3253a8320c2484c78d686404fad18fbb30f

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Wed May 13 16:42:07 2009 +0100

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

Conflicts:
	recipes/psplash/psplash.inc

---