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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Dec  5 21:00:57 2009 +0100

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

Conflicts:
	recipes/e17/e-wm_svn.bb

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

---