merge of '7515f43924dd61866be5833ca02d8cc7252e7ebc'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 17 Dec 2007 10:22:06 +0000 (10:22 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 17 Dec 2007 10:22:06 +0000 (10:22 +0000)
commit0fc1bbc2eb55e77824c7e09beb085aad21816044
tree28190758ebf09e6bbea5440c67f0194c357566ce
parentc6e1c3935c055d896fc549bb8acfb4aeba2b231b
parent66ce88d1ea9465357901d96d1b12db25445fc97d
Merge ... '7515f43924dd61866be5833ca02d8cc7252e7ebc'
     and 'f88bbdd4b314a31b08b342dd74417b7202cb5c26'