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)
     and 'dc26b71fb757ec4210a3a5f0e819b6e76036ac61'


Trivial merge