merge of '65fb29ae308602940228134ed6cbae42627b7c1e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 12 Aug 2007 22:00:43 +0000 (22:00 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 12 Aug 2007 22:00:43 +0000 (22:00 +0000)
     and '7a67ee2faf59e6803887617211f99fcc2f9cf4e7'


Trivial merge