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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Apr 14 15:08:21 2010 +0200

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

Conflicts:
	recipes/linux/linux-openmoko-2.6.32_git.bb
	recipes/xorg-xserver/xserver-xorg_git.bb

---