merge of '151a325a6a314faf871bda4dbaf1a03741b81e83'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 13 Jun 2007 10:28:43 +0000 (10:28 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 13 Jun 2007 10:28:43 +0000 (10:28 +0000)
     and '64e4141742ce7b9bb873c115920491a60d6fd60d'


Trivial merge