[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: b92c6119dc85bac51e6309e86fad4c861d8bcb5b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b92c6119dc85bac51e6309e86fad4c861d8bcb5b

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jan 16 11:45:15 2010 +0100

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

Conflicts:
	recipes/uclibc/uclibc.inc

---