merge of '6ce5f26b9e3717a906b07e8edd9eb1f3d7867889'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 22 Jul 2007 17:30:36 +0000 (17:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 22 Jul 2007 17:30:36 +0000 (17:30 +0000)
     and '86395f96ab01c06ac1b4a1f09708e75bf07b969f'


Trivial merge