merge of '367c12212e0958deb4779abbb80a10a6bd71e208'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 13 Sep 2007 12:35:39 +0000 (12:35 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 13 Sep 2007 12:35:39 +0000 (12:35 +0000)
     and '9efbf30d62a0b59fefb30c23ea0e41390a2ef60e'


Trivial merge