merge of '6f38dd43d055a41dad4efd3faa8fb28f66c10ae3'
authorKoen Kooi <koen@openembedded.org>
Wed, 24 Sep 2008 08:33:38 +0000 (08:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 24 Sep 2008 08:33:38 +0000 (08:33 +0000)
     and 'cce0978f34bb80458a90186b20dadfd46ccfb0b1'


Trivial merge