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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jan 13 12:41:07 2010 +0100

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

Conflicts:
	recipes/opkg/opkg.inc
	recipes/opkg/update-alternatives-merge.inc
	recipes/update-alternatives/update-alternatives-cworth.inc

---