merge of 23f392c4a32f829ba2c33998e47b14cc08c51a26
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 28 Jul 2006 11:32:53 +0000 (11:32 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 28 Jul 2006 11:32:53 +0000 (11:32 +0000)
     and a5ef4c4c70b547e6337fc06d8e0f67f7be568250


Trivial merge