[oe-commits] Martin Jansa : Merge branch 'org.openembedded.dev' of git at git.openembedded. org:openembedded into martin_jansa/srcpv

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec 22 13:52:09 2009 +0100

Merge branch 'org.openembedded.dev' of git at git.openembedded.org:openembedded into martin_jansa/srcpv

Conflicts:
	recipes/xorg-driver/xf86-video-glamo_git.bb

---