merge of '971d18af52c7881e09c9f5ffa43d9bf33216ce83'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 19 Feb 2007 07:17:29 +0000 (07:17 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 19 Feb 2007 07:17:29 +0000 (07:17 +0000)
     and 'cc76392ac5a7b1ccde5981fd2e02094b88a5240a'


Trivial merge