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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Jan 22 12:54:18 2010 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into shr/unstable

Conflicts:
	recipes/uclibc/uclibc_nptl.bb

---