[oe-commits] Martin Jansa : Merge commit 'origin/org.openembedded.dev' into martin_jansa /xorg-7.5

[git version control]

Module: openembedded.git
Branch: martin_jansa/xorg-7.5
Commit: fd265c020e524366c8db69fbedd2cf0bad471324
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fd265c020e524366c8db69fbedd2cf0bad471324

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Dec 16 09:28:42 2009 +0100

Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5

Conflicts:
	conf/machine/om-gta01.conf
	recipes/mesa/mesa-dri_git.bb

---