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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Mar 27 16:10:13 2010 +0100

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

Conflicts:
	recipes/linux/openezx-kernel_git.bb
	recipes/x-load/x-load_git.bb

---