[oe-commits] Klaus Kurzmann : Merge remote branch 'origin/org.openembedded.dev' into srcpv

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 18f33cdd3824e23335e357e66c78c698c80cd60f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=18f33cdd3824e23335e357e66c78c698c80cd60f

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

Merge remote branch 'origin/org.openembedded.dev' into srcpv

Conflicts:
	recipes/python/python-phoneutils_git.bb

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

---