merge of '15b74f4a5710e603d60db9716cb6cb0619511ac7'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 31 Jul 2007 16:21:16 +0000 (16:21 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 31 Jul 2007 16:21:16 +0000 (16:21 +0000)
     and '8961e177cdb0b701e3bb0304ec24d5c4a3947254'


Trivial merge