merge of '017bdeaa3b1e0331f3491b2ab736655e2a040771'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Jun 2007 21:34:21 +0000 (21:34 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Jun 2007 21:34:21 +0000 (21:34 +0000)
     and 'e64bb182478137ad27f3644e8be441efed8135ff'


Trivial merge