merge of '8819bbf6f539509b1d3b6df6a827db9c8050a2e3'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 Jan 2008 10:46:14 +0000 (10:46 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 Jan 2008 10:46:14 +0000 (10:46 +0000)
     and 'adb47d7ef0b6d4d6be87bfe0025501107f2d04cc'


Trivial merge