merge of '0b6354a57db70b62eccbe5522490947545014f85'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 25 Oct 2007 16:17:01 +0000 (16:17 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 25 Oct 2007 16:17:01 +0000 (16:17 +0000)
     and 'bfb3f591b7494217c22a8a5b6daf3902bdd7cd03'


Trivial merge