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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Feb  2 00:13:32 2010 +0100

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

Conflicts:
	recipes/uclibc/uclibc_nptl.bb

---