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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jan  6 19:19:17 2010 +0100

Merge remote branch 'origin/martin_jansa/srcpv' into shr/merge

Conflicts:
	recipes/libsdl/libsdl-mixer_1.2.11.bb

---