merge of '445066af3cf565c9d88cd6187570272cfa926958'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 8 Aug 2007 17:06:27 +0000 (17:06 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 8 Aug 2007 17:06:27 +0000 (17:06 +0000)
     and '76d3b20f964cec7e37a6e3a20c6298ed35aee629'


Trivial merge