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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Tue Dec  1 20:21:37 2009 +0100

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

Conflicts:
	recipes/shr/shr-settings_git.bb

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

---