[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ merge

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec  8 07:36:43 2009 +0100

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

Conflicts:
	recipes/uclibc/uclibc_nptl.bb

---