merge of 70cd861a84040db0f14008d8552b1f2dbc5c8084
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 7 Aug 2006 11:11:46 +0000 (11:11 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 7 Aug 2006 11:11:46 +0000 (11:11 +0000)
     and a7904b535294d222e83d153c9fc22b575a5952c4


Trivial merge