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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sun Dec 13 12:20:15 2009 +0100

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

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

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

---