merge of '9e9036263aa2cf4c53293c1bd44b54810ab8834f'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Aug 2008 14:45:23 +0000 (14:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Aug 2008 14:45:23 +0000 (14:45 +0000)
     and 'bfc7cf00ad3b7b17b8c438b23a1b5de36ceef986'


Trivial merge