[oe-commits] Martin Jansa : Merge branch 'org.openembedded.dev' of git.openembedded.org: openembedded into martin_jansa/srcpv

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec  8 13:41:14 2009 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

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

---