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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Dec 30 08:42:32 2009 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

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

---