merge of '574770392742c88b4d3a04f82d9c482f3b529ac7'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 29 Nov 2006 17:00:14 +0000 (17:00 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 29 Nov 2006 17:00:14 +0000 (17:00 +0000)
     and 'd61842e6dad3002a8c8c23c0ebd557b9e2bcd04f'


Trivial merge