merge of '16b2b0213ee4ffed03286c1d3a6c02a47de6cbac'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Aug 2007 15:49:42 +0000 (15:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 2 Aug 2007 15:49:42 +0000 (15:49 +0000)
     and '4f147d2d94a319ec848b2853d52d9065acfa63d5'


Trivial merge