merge of '05c8ac666734fffe4be207c184a8d6ec410c203f'
authorKoen Kooi <koen@openembedded.org>
Fri, 29 Aug 2008 17:40:21 +0000 (17:40 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 29 Aug 2008 17:40:21 +0000 (17:40 +0000)
     and 'cdd9d1c543126b02dd14925c940ec6a31e071be8'


Trivial merge