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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Nov  3 12:43:06 2009 +0100

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

Conflicts:
	conf/checksums.ini

---