merge of 9c1afd1eb601fbbce3f463329ea539bd31524d01
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 Aug 2006 14:56:17 +0000 (14:56 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 Aug 2006 14:56:17 +0000 (14:56 +0000)
     and cedc926383410ea349e3ee318637d9ac0f9b0e1f


Trivial merge