merge of '0e2728379c2e900b805d816523cedae63a8ec8e8'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 18 May 2007 21:56:09 +0000 (21:56 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 18 May 2007 21:56:09 +0000 (21:56 +0000)
     and '4df275d191d23de3095b0443f1ab454afcc2a153'


Trivial merge