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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Mon Dec 14 21:33:49 2009 +0100

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

Conflicts:
	recipes/uclibc/uclibc_nptl.bb

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

---