merge of '2d48e0fc062c46f883515824089be8f20112f660'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Jul 2007 16:56:39 +0000 (16:56 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Jul 2007 16:56:39 +0000 (16:56 +0000)
     and '4a07a607b67720e33adbdc68da34bdc153b7f87d'


Trivial merge