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

[git version control]

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

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

Merge commit 'origin/martin_jansa/srcpv' into shr/merge

Conflicts:
	recipes/mesa/mesa-dri_git.bb

---