merge of '3522489c0311d58fd9ccb9e295ecac8a0a18fc21'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 7 Jun 2007 00:32:35 +0000 (00:32 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 7 Jun 2007 00:32:35 +0000 (00:32 +0000)
     and '7ce845adf550b64d9d2250d29acf1667cf40a689'


Trivial merge