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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Mar 30 16:55:14 2010 +0200

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

Conflicts:
	recipes/mesa/mesa-dri-glsl-native.bb
	recipes/u-boot/u-boot_git.bb

---