merge of '2f5bd4fb087c959aaf282ec818451c284de8277c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 27 Aug 2007 12:46:24 +0000 (12:46 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 27 Aug 2007 12:46:24 +0000 (12:46 +0000)
     and 'b23b25b1fe0555089f3535775690edbf9ad885f0'


Trivial merge