merge of '2cea807f786ead2b5e28b2227fcc8a96752158ef'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 17 Feb 2007 00:08:13 +0000 (00:08 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 17 Feb 2007 00:08:13 +0000 (00:08 +0000)
commitdbe83e6e21f5fc8124619a1cea63a23ed40f9b47
tree87c8468cab50a6bdd4e4348a1ede9341c11977ab
parent1f28e22242c82fe1ba1c4ad8514dd682fc732bc9
parentc0598cc6a75b29de02a39f0a4fd7c4979dde6a9b
Merge ... '2cea807f786ead2b5e28b2227fcc8a96752158ef'
     and 'dc26b71fb757ec4210a3a5f0e819b6e76036ac61'