merge of '10e6bf1f992b208b919b4fc707871e1e1ae7e91e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 23 Aug 2008 13:23:05 +0000 (13:23 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 23 Aug 2008 13:23:05 +0000 (13:23 +0000)
     and 'aeb148ecdb7be061e0dc9a58ffebbeca28f2e26d'


Trivial merge