merge of '24425de40f0bf34d6e4ec14e718e9691d9943c60'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 14 Sep 2007 16:16:40 +0000 (16:16 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 14 Sep 2007 16:16:40 +0000 (16:16 +0000)
     and '5fab22ef48f5f0191de6ab5177c8b8c65dd3b3cb'


Trivial merge