merge of '574f948e2e34c92b8569814f4622a4be67664b8b'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:19:53 +0000 (14:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:19:53 +0000 (14:19 +0000)
     and 'e10b25001ecd4fdb4051e6efb417dacc1dd2b985'


Trivial merge