merge of '355fab3d1867a0540055c0c85f9e5763ce090bfe'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 14:20:32 +0000 (14:20 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 14:20:32 +0000 (14:20 +0000)
     and 'adeec49ff94dd07cb7ad516e15f80ca85211624a'


Trivial merge