merge of '8f81066c1bea85c3191ff30a0d721cd1a3ccc041'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 15 Jan 2007 20:46:52 +0000 (20:46 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 15 Jan 2007 20:46:52 +0000 (20:46 +0000)
     and '98ff999fc95d5b6c4cf5fd58a2c502aea38ea350'


Trivial merge