merge of 5979643441d3c55d014e5c0f2955c6c482b2d0bf
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 26 Jul 2006 12:19:27 +0000 (12:19 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 26 Jul 2006 12:19:27 +0000 (12:19 +0000)
     and 8718924d1b4932954af92b862bc4ca06150cf900


Trivial merge