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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Feb 23 15:20:35 2010 +0100

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

Conflicts:
	recipes/xorg-xserver/xserver-xorg_git.bb

---