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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Wed Apr 14 14:06:36 2010 +0200

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

Conflicts:
	recipes/freesmartphone/fsotdld_git.bb
	recipes/x-load/x-load_git.bb

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

---