merge of '50409e326e2ff8f7448fc8f41f187589486432cb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 11 May 2007 07:09:57 +0000 (07:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 11 May 2007 07:09:57 +0000 (07:09 +0000)
     and '89c62d328d708a711c2c20ac45d03d6fd73aef69'


Trivial merge