merge of '2f5bd4fb087c959aaf282ec818451c284de8277c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 27 Aug 2007 12:46:24 +0000 (12:46 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 27 Aug 2007 12:46:24 +0000 (12:46 +0000)
commitc08eeb8f1bee8ce78dee1f0e3cb8064b7b677ea8
treec35e8cd5b1d63cbe5a1475717184bf2624e7b394
parentdc227b443d68008ded204905dbd2cba3ff5e3d3c
parent2e2d762a296bdc3b5ac6f6a0df1278872c93d9f8
Merge ... '2f5bd4fb087c959aaf282ec818451c284de8277c'
     and 'b23b25b1fe0555089f3535775690edbf9ad885f0'