merge of '34e43612b25ab2cef55713b9d003cdb82e7cfa25'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 12 Feb 2008 15:34:08 +0000 (15:34 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 12 Feb 2008 15:34:08 +0000 (15:34 +0000)
     and 'f9a76e06cd939b7150cc838a647f06ab8ae0e670'


Trivial merge