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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Feb 19 08:53:30 2010 +0100

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

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

---