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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Thu Nov 26 11:17:36 2009 +0100

Merge remote branch 'origin/org.openembedded.dev' into shr/merge

Conflicts:
	recipes/shr/e-wm-menu-shr_git.bb

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

---