merge of '66573a06c1ee62e38d70a6c82f8d99a41243cd5c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 6 Jul 2007 16:35:29 +0000 (16:35 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 6 Jul 2007 16:35:29 +0000 (16:35 +0000)
     and '77ccc19a41dcb49d566dc709b5d6a8a4043567b4'


Trivial merge