merge of 'cdb2e28e89c82aad619cd71c60829800e4dd8d0b'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 31 Oct 2007 12:13:24 +0000 (12:13 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 31 Oct 2007 12:13:24 +0000 (12:13 +0000)
     and 'eca725be04182c9d2ebab13eddbe22f7e48c2b17'


Trivial merge