merge of 'ef18f00dc16fe77fe2fd46a7dbf853dfe443b8c3'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Jun 2007 13:40:58 +0000 (13:40 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Jun 2007 13:40:58 +0000 (13:40 +0000)
     and 'f8a5fa4dd00390287394387b902bb418d6d35b2f'


Trivial merge