[oe-commits] Klaus Kurzmann : Merge branch 'srcpv' into shr/merge

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Nov 28 20:40:29 2009 +0100

Merge branch 'srcpv' into shr/merge

Conflicts:
	recipes/python/python-phoneutils_git.bb

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---