merge of '228193d507da8cea1fcf8c9e3c43ccb070860df0'
authorKoen Kooi <koen@openembedded.org>
Mon, 12 Nov 2007 11:35:17 +0000 (11:35 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 12 Nov 2007 11:35:17 +0000 (11:35 +0000)
     and '98155415179a9d159b94176f081aef69657bd2cd'


Trivial merge