merge of '28e5885cc223a5b50756427564336ed39035d498'
authorKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 14:10:51 +0000 (14:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 14:10:51 +0000 (14:10 +0000)
commita720e1456a687ff53ab30cfe3d3ab8d18eabc1eb
tree3385fe7c419780324fc67e24c4a64d61e6318899
parente396177148415788c33f161e160d494b40ab1efa
parent4b69a66b9d14248635ad21b6c24b1e5b449caa86
Merge ... '28e5885cc223a5b50756427564336ed39035d498'
     and '8cdc9906876cb88040360ad2c43a38608055f2b4'