merge of '487b26a10d1dba93c52637b9458e55e24907a81c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 4 Apr 2007 11:10:15 +0000 (11:10 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 4 Apr 2007 11:10:15 +0000 (11:10 +0000)
     and '5a224ad42c629112a32b3825f26fb2c33dee1b3b'


Trivial merge