merge of '19e8907fe35a9f46f690201cf752b83fc25cbe4d'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 27 May 2007 12:09:46 +0000 (12:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 27 May 2007 12:09:46 +0000 (12:09 +0000)
     and '60f25719f044f04c78ec8cfa8af6a503b643df4e'


Trivial merge