merge of '2f33e3153b5f921d4625e4f8ea16adf0f25d161c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 15:18:21 +0000 (15:18 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 15:18:21 +0000 (15:18 +0000)
     and '502da1565df8ea89aed66c5cfc7dee8319969c68'


Trivial merge