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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Feb  2 12:34:30 2010 +0100

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

Conflicts:
	recipes/uclibc/uclibc_git.bb

---