merge of '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Feb 2007 16:31:13 +0000 (16:31 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Feb 2007 16:31:13 +0000 (16:31 +0000)
     and 'ceb628b9d1e93ba31a266b15bf06b5527054eaf3'


Trivial merge