merge of '5d04d04dfc4ca490d4feb89775a2681116f3a403'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 00:44:08 +0000 (00:44 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 00:44:08 +0000 (00:44 +0000)
     and 'ef7b9f80525af0b2374045ede01ecc82e2b7cac8'


Trivial merge