merge of '141cd340dd8e13975199b977f90b57e74e522707'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Feb 2007 23:30:47 +0000 (23:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Feb 2007 23:30:47 +0000 (23:30 +0000)
     and '9912ae5933a91810d3c84c6647a19ac430cbd053'


Trivial merge