merge of '8c0681c145743970130cbe62da92b45f76b3c4b5'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 17:14:02 +0000 (17:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 17:14:02 +0000 (17:14 +0000)
     and 'b459044149ae9e0fc21221903548ff66c0427cef'


Trivial merge