merge of '3eac26db70c312053491f643dc9df91f03c13be2'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 19 Jun 2007 14:01:26 +0000 (14:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 19 Jun 2007 14:01:26 +0000 (14:01 +0000)
     and '86eacc43ad1d11e9d0f9fd2bf034da287c974ffe'


Trivial merge