[oe-commits] Klaus Kurzmann : Merge branch 'org.openembedded.dev' into shr/unstable

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Thu Jan 28 19:06:40 2010 +0100

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

Conflicts:
	recipes/freesmartphone/frameworkd_git.bb

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

---