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

[git version control]

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

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

Merge commit 'origin/martin_jansa/xorg-7.5' into shr/merge

Conflicts:
	conf/distro/include/angstrom-2008-preferred-versions.inc

---