merge of '0c14edad9fe9be01f3dcd8bb7481391246756938'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Aug 2007 11:34:53 +0000 (11:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Aug 2007 11:34:53 +0000 (11:34 +0000)
     and 'afa51d1bd3a6d0684595da996d34d4923676187f'


Trivial merge