[oe-commits] Klaus Kurzmann : Merge branch 'org.openembedded.dev' into martin_jansa/ srcpv

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 54fa869952dc6b7c2f05018f65434877257d44de
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=54fa869952dc6b7c2f05018f65434877257d44de

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Tue Dec 15 14:46:02 2009 +0100

Merge branch 'org.openembedded.dev' into martin_jansa/srcpv

Conflicts:
	recipes/mesa/mesa-xlib_7.2.bb
	recipes/uclibc/uclibc_nptl.bb
	re-add SRCPV to illume-keyboards-shr

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---