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)
commitee38ed000e7730986329388a9ea9df259f252a19
treed5909f56c7d74adb560eb1fb278b5004d820218c
parenta5d9d8e302061e724dc719c0f86e37230f767436
parentc6ac2e1ddd21a9d4ddf15192f885b0250175375a
Merge ... '574770392742c88b4d3a04f82d9c482f3b529ac7'
     and 'd61842e6dad3002a8c8c23c0ebd557b9e2bcd04f'