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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov 19 19:13:42 2009 +0100

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

Conflicts:
	recipes/linux/linux-davinci_git.bb
	recipes/openmoko-projects/paroli_git.bb
	recipes/openmoko2/openmoko-alsa-scenarios.bb
	recipes/python/python-phoneutils_git.bb

---