merge of '1ee32088f5f2a9a808845cf1074bbe5566d7be4a'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:16:59 +0000 (10:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:16:59 +0000 (10:16 +0000)
     and '6651fb704192756bf7c80d213d5cb1e48a1541dd'


Trivial merge