merge of '434c9b83795714321c5e83703daa92ea144962c8'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 4 Aug 2008 07:24:51 +0000 (07:24 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 4 Aug 2008 07:24:51 +0000 (07:24 +0000)
     and 'df379835be88c87afe28ebc4ac3ec609317fc047'


Trivial merge