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)
commit9ff03b934dd0e9649a49002b7a0a4258322722b6
treefc0c3333f3be5c52be9a5604d15a9d3e0834b9e0
parentc1c91490020a6a9a766802de7491b5c22b1bcbeb
parent2c724d999d73dbd7b5718530b582f2edbf699bb3
Merge ... '16b2b0213ee4ffed03286c1d3a6c02a47de6cbac'
     and '4f147d2d94a319ec848b2853d52d9065acfa63d5'