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

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Tue May 19 11:50:45 2009 +0100

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

Conflicts:
	recipes/psplash/psplash.inc

---