merge of '5075b3f69144c8ca977abda48869d41f724d1334'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 30 Mar 2007 20:19:11 +0000 (20:19 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 30 Mar 2007 20:19:11 +0000 (20:19 +0000)
commitba69d5da69dc8c808269c61e8ce254e60a49e823
tree6b3a8083c1f1f993d68385a9d79b49ba5ad45fb0
parent5ed24bd44de3235edcb3ef2704d70de610fc1878
parent1d7bceff6270b94c59ffd445d98261ac36e58315
Merge ... '5075b3f69144c8ca977abda48869d41f724d1334'
     and '934ffc455f2129883b9866a2940c70a68daabeee'