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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Apr 10 02:20:45 2010 +0200

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

Conflicts:
	recipes/pyphonelog/pyphonelog_git.bb

---