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

[git version control]

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

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

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

Conflicts:
	recipes/python/python-phoneutils_git.bb

---