merge of '7861396822409ca6c3e24762209c49eec2b2d690'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 15:57:43 +0000 (15:57 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 15:57:43 +0000 (15:57 +0000)
     and 'a97e0415ed13e5b5fd6dd68b390a81a55f0cad34'


Trivial merge