merge of '0cc484607260a013c209789586a468c114c20254'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 26 Feb 2007 11:01:56 +0000 (11:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 26 Feb 2007 11:01:56 +0000 (11:01 +0000)
     and 'a3c39ebb70f0eef815ed0f3759e0be1354e112f8'


Trivial merge