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)
commite5428e2948ece74a974d96d8826b0da644d8bb9a
treec300c1bb2d06cb1999a0ceecd49dae70d9b7e459
parentf3c48a95206c78d7ab5cb8ca83ba58bd41c1ff9b
parent7427792332ae4bfad2d96926f55aa082e2e9c97b
Merge ... '337a5b25ca63db8c280a6eb478dba96f7fb3b342'
     and '468f104f05c242db9068e98253e3c659c3d2c9b2'