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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Wed Oct 14 22:34:39 2009 +0200

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

Conflicts:
	conf/checksums.ini

---