Merge remote branch 'upstream/org.openembedded.dev' into org.openembedded.dev
authorSteffen Sledz <sledz@dresearch.de>
Thu, 11 Mar 2010 11:39:14 +0000 (12:39 +0100)
committerSteffen Sledz <sledz@dresearch.de>
Thu, 11 Mar 2010 11:39:14 +0000 (12:39 +0100)

Trivial merge