merge of '43b7d311b8108ccaa97f5955ea74f245fe291dc0'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 15:56:54 +0000 (15:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 15:56:54 +0000 (15:56 +0000)
     and 'beea20d8bd60f3598225741e5395f689cd57bdf1'


Trivial merge