[oe-commits] Martin Jansa : Merge remote branch 'origin/martin_jansa/xorg-7.5' into shr/ merge

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov  4 16:27:32 2009 +0100

Merge remote branch 'origin/martin_jansa/xorg-7.5' into shr/merge

Conflicts:
	conf/checksums.ini
	conf/distro/include/preferred-xorg-versions-X11R7.5.inc
	recipes/xorg-driver/xf86-video-glamo_git.bb
	recipes/xorg-lib/libx11_1.3.2.bb

---