merge of '002eda28acb76c39ae5920ebf07cf3756277bd37'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 6 Jun 2008 11:30:11 +0000 (11:30 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 6 Jun 2008 11:30:11 +0000 (11:30 +0000)
     and '7cdf64b464cc0539a2bd9f5642023ac33825ebc5'


Trivial merge