merge of '04f5cc86d8508c3838a5112313a7db80201c4039'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 11:13:30 +0000 (11:13 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 11:13:30 +0000 (11:13 +0000)
     and 'cb3abb910774efcd3e2446771f196413a524b227'


Trivial merge