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

[git version control]

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

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

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

Conflicts:
	recipes/shr/e-wm-config-illume2-shr_git.bb
	recipes/shr/shr-e-gadgets_git.bb

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

---