merge of '7426dbd625295a2b15666267369a0733c5b2e3f8'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 19:38:34 +0000 (19:38 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 19:38:34 +0000 (19:38 +0000)
     and 'dd2e25c6a29c15ebebb630124d0e86b9e4a00650'


Trivial merge