[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: 5ca1756001dcf0464b167ba07986438f89604787
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5ca1756001dcf0464b167ba07986438f89604787

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Nov  8 10:15:09 2009 +0100

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

Conflicts:
	recipes/xorg-font/font-misc-misc_1.1.0.bb

---