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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sun Mar 28 19:26:32 2010 +0200

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

Conflicts:
	recipes/freesmartphone/fso-specs_git.bb
	recipes/freesmartphone/libfso-glib_git.bb

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

---