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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec 15 14:46:11 2009 +0100

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

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

---