merge of '83d98662c6868a7aa140a2381a42dd66253867b5'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 22 Nov 2006 11:32:24 +0000 (11:32 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 22 Nov 2006 11:32:24 +0000 (11:32 +0000)
     and '959a6162fa3ea78b9386188cf845e87e4556c6f8'


Trivial merge