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

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

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

Conflicts:
	recipes/mesa/mesa-dri_git.bb

---