[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ unstable

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Feb 19 07:27:22 2010 +0100

Merge remote branch 'origin/org.openembedded.dev' into shr/unstable

Conflicts:
	recipes/python/python-phoneutils_git.bb
	recipes/shr/libphone-utils_git.bb

---