merge of '0725dca697debd47e527ba8545a1c2f3cded398f'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Jun 2007 15:30:53 +0000 (15:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Jun 2007 15:30:53 +0000 (15:30 +0000)
     and '785af4fbee0bb0cddc82de7efab348482551f339'


Trivial merge