merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 12 Jun 2007 14:45:27 +0000 (14:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 12 Jun 2007 14:45:27 +0000 (14:45 +0000)
     and '8dfee9b2427785432e4161eb7cc749155230e08e'


Trivial merge