merge of '2a83a3cf4b622a0ca66d5de38b7d9bbb6be39bb1'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Mar 2007 12:19:49 +0000 (12:19 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Mar 2007 12:19:49 +0000 (12:19 +0000)
     and 'bc33dfddb8c5346507272c2bd3b2bd5bfc97d203'


Trivial merge