merge of '786f6df732a820a55dd0bd7dfcae2fceed17eb51'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 19 Mar 2007 12:06:18 +0000 (12:06 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 19 Mar 2007 12:06:18 +0000 (12:06 +0000)
     and 'ebdd90a75ba631aac8cfe0075119597bd65de4cf'


Trivial merge