merge of '5675a11f29ad06019a800afe9d5c0b13611dc46a'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 10 Jul 2007 10:11:27 +0000 (10:11 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 10 Jul 2007 10:11:27 +0000 (10:11 +0000)
     and '84e965db62dfbbf23fc3c5e2bd7ebf53391874db'


Trivial merge