merge of 'cec78a074a0675e54847a082185ddf501faa9d67'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Feb 2007 15:47:32 +0000 (15:47 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Feb 2007 15:47:32 +0000 (15:47 +0000)
commit46bb868f542f65434aa7c611fc655cb726ba3022
treed2f81b0d2d1bbb6a01d5d0659f0457bb50d43563
parent85fec8b2edf978b8061fafcb5361bd110782326e
parent23c6875a205a79525d228125449327af52ff3d8c
Merge ... 'cec78a074a0675e54847a082185ddf501faa9d67'
     and 'd5039444b5c22adb43780c8597c4071b78d8f486'