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

[git version control]

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

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

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

Conflicts:
	recipes/shr/shr-wizard_git.bb

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

---