merge of '8e8a1c48faec2dc479cec1aee6c9031525ea9306'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Jan 2008 16:57:37 +0000 (16:57 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Jan 2008 16:57:37 +0000 (16:57 +0000)
     and 'ec7917dc2ea4817a839295ebf8a8cb597ebb04ff'


Trivial merge