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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Tue Jan 26 20:12:28 2010 +0100

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

Conflicts:
	recipes/freesmartphone/frameworkd_git.bb
	recipes/uclibc/uclibc_git.bb
	recipes/uclibc/uclibc_nptl.bb

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

---