merge of '5075b3f69144c8ca977abda48869d41f724d1334'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 30 Mar 2007 20:19:11 +0000 (20:19 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 30 Mar 2007 20:19:11 +0000 (20:19 +0000)
     and '934ffc455f2129883b9866a2940c70a68daabeee'


Trivial merge