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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr  2 14:55:15 2010 +0200

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

Conflicts:
	recipes/xorg-driver/xf86-video-glamo_git.bb

---