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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sun Oct 11 15:37:23 2009 +0200

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

Conflicts:
	conf/checksums.ini

---