merge of 'b27ad9ec4f0d5643c56c77358b7e886841ea363d'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Feb 2007 07:32:34 +0000 (07:32 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Feb 2007 07:32:34 +0000 (07:32 +0000)
     and 'f545cd4511e822868b1f61763ab488576a4945ce'


Trivial merge