merge of '471f6e7d5fb5bc4d13a2338851dabca9f72b3f0a'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Sep 2007 10:41:59 +0000 (10:41 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Sep 2007 10:41:59 +0000 (10:41 +0000)
     and '89b1d1f0f032b64f7620006be8bcf6271c70f4b8'


Trivial merge