merge of '2940479bcfd956eef260cc704db455cc804377b8'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 20 Aug 2007 11:26:49 +0000 (11:26 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 20 Aug 2007 11:26:49 +0000 (11:26 +0000)
     and '46647ef87b7a613022c3f8fb0a5c5b1e117aecab'


Trivial merge