merge of '7d055c0af1800d25200ac6ecd4c27f7dbf792959'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Jun 2007 16:01:46 +0000 (16:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Jun 2007 16:01:46 +0000 (16:01 +0000)
     and '87fab946dd0ff671b8bdc6287b092c82e877af35'


Trivial merge