[oe-commits] Sebastian Spaeth : Merge branch 'org.openembedded.dev' into shr/merge

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: d0928c9e7ed548f20d0549e76876e31f50e305d1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d0928c9e7ed548f20d0549e76876e31f50e305d1

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Mon Dec  7 14:55:33 2009 +0100

Merge branch 'org.openembedded.dev' into shr/merge

Conflicts:
	recipes/shr/shr-splash-theme-logo_git.bb
	recipes/shr/shr-splash_git.bb

Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>

---