merge of 'd49bb94575326116c1e8f8c649730d522f234dae'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Apr 2007 16:52:13 +0000 (16:52 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Apr 2007 16:52:13 +0000 (16:52 +0000)
     and 'e4274d99726eb383f5eb120ad5097b8cc4483143'


Trivial merge