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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Apr  3 23:58:33 2010 +0200

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

Conflicts:
	recipes/linux/linux-openmoko-devel_git.bb
	recipes/obsolete/shr/alsa-scenarii-shr_git.bb
	recipes/shr/frameworkd-config-shr_git.bb

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

---