merge of 'd283e920162c9ff5c4a3392010a4376d56a02b3c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 16 Feb 2007 04:31:54 +0000 (04:31 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 16 Feb 2007 04:31:54 +0000 (04:31 +0000)
     and 'ff4a9eec58fba61dc8cafa4957305ccd0140430a'


Trivial merge