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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Fri Oct 16 09:44:56 2009 +0200

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

Conflicts:
	conf/checksums.ini

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

---