merge of '0dce271df8041510469d6f47bc99206c42c821e1'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 4 Apr 2007 12:10:08 +0000 (12:10 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 4 Apr 2007 12:10:08 +0000 (12:10 +0000)
     and '5a224ad42c629112a32b3825f26fb2c33dee1b3b'


Trivial merge