merge of '4e038cbec73ce09bc146fb74f60b2c6d4359a29b'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 6 May 2007 16:09:44 +0000 (16:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 6 May 2007 16:09:44 +0000 (16:09 +0000)
     and '61b65ffb0a858399f89407df40b6469b203bda44'


Trivial merge