merge of 'd869db4c0ac7d1350976e17e00fe6ec914dd9499'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 15:50:07 +0000 (15:50 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 15:50:07 +0000 (15:50 +0000)
     and 'dede9079788e02b5f4efb62d0efbe5df90c32ee0'


Trivial merge