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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Tue Nov 24 16:26:37 2009 +0100

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

Conflicts:
	recipes/webkit/webkit-efl_git.bb

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

---