merge of '689e57bae9a2678694a0233e81f710e4878928f4'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Nov 2007 11:07:58 +0000 (11:07 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Nov 2007 11:07:58 +0000 (11:07 +0000)
     and 'c2e1d9a66fe20e02ea4226aaff7de2ccde79ffba'


Trivial merge