merge of '9d6e060052df45c5be50896005c5b965f0d64900'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 Jan 2008 14:08:49 +0000 (14:08 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 Jan 2008 14:08:49 +0000 (14:08 +0000)
     and 'c794a426d2a55b0c4b5f1f6fee90c8272bd266e9'


Trivial merge