[oe-commits] Michael 'Mickey' Lauer : Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev

[git version control]

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

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Feb 10 14:33:57 2010 +0100

Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev

Conflicts:

	conf/checksums.ini

---