merge of '538b8a92adf30fc2607a93bc9b05dd896bd35712'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 13 May 2007 09:45:34 +0000 (09:45 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 13 May 2007 09:45:34 +0000 (09:45 +0000)
     and '60b106c65d3e98f8aebfb8cdbf6947d4519b9798'


Trivial merge