merge of '017bdeaa3b1e0331f3491b2ab736655e2a040771'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Jun 2007 21:34:21 +0000 (21:34 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Jun 2007 21:34:21 +0000 (21:34 +0000)
commit9bb278ec49e82e77c2560996a998f1a22cec146d
treeff4f3ca4c911b36dabeebd5239e01d2e664ddae5
parent19132d0835d2ffbf17823da5f868a3181dd48d9e
parent6c067d922445e9138fbe365be3bdd95b10e57326
Merge ... '017bdeaa3b1e0331f3491b2ab736655e2a040771'
     and 'e64bb182478137ad27f3644e8be441efed8135ff'