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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Nov  9 23:15:33 2009 +0100

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

Conflicts:
	conf/distro/include/preferred-xorg-versions-X11R7.5.inc

---