merge of 'e383b4da996a2fc451decc374fb00f9c927e9ca1'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 16:17:24 +0000 (16:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 16:17:24 +0000 (16:17 +0000)
     and 'fdff4c7b074f0518fdc8379e6902fa4e4d984894'


Trivial merge