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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sun Nov 22 21:33:00 2009 +0100

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

Conflicts:
	recipes/e17/e-wm_svn.bb

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

---