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)
commit9d5d173a2d4df73e4ee68a3013498bbccde51bdc
treee839823c5a45477a3430518ebb308b35f42f89bb
parent7caaf3182866f6ad99c56e9df1a385c230efe8d3
parent1c5d5b4503c92bcb72eb26014513f8c6e4636764
Merge ... '03be9e5a3850ab5de1d4fc22dae2a3d06eabcb39'
     and 'b8fa0cf27dc1754245e1f078f2c5d7ef0365ea2e'