merge of '427729cc94e3f82c079a15e376d7ded66c9b2d52'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 30 Mar 2007 10:08:05 +0000 (10:08 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 30 Mar 2007 10:08:05 +0000 (10:08 +0000)
     and 'b337872d7ffb085eb29183187ad26bc5a7735e1a'


Trivial merge