merge of a7036976b6cb2edb2ff33917effbb633b05764e6
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 18 Aug 2006 14:28:44 +0000 (14:28 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 18 Aug 2006 14:28:44 +0000 (14:28 +0000)
     and f370cb48efdf23e94cf290e6995a20520736afa8


Trivial merge