merge of '337a5b25ca63db8c280a6eb478dba96f7fb3b342'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 2 Jun 2007 17:20:18 +0000 (17:20 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 2 Jun 2007 17:20:18 +0000 (17:20 +0000)
     and '468f104f05c242db9068e98253e3c659c3d2c9b2'


Trivial merge