merge of '426022a70eefa9cef4f266532c2febde719d5cd9'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 14:51:20 +0000 (14:51 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 14:51:20 +0000 (14:51 +0000)
     and 'f058afdd536f81347074a30430c2771085a40dc0'


Trivial merge