merge of '03be9e5a3850ab5de1d4fc22dae2a3d06eabcb39'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 7 Aug 2007 13:40:39 +0000 (13:40 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 7 Aug 2007 13:40:39 +0000 (13:40 +0000)
     and 'b8fa0cf27dc1754245e1f078f2c5d7ef0365ea2e'


Trivial merge