merge of '3a81a92297b91a0316a744c06361a9cdf470ede8'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Mar 2007 11:25:47 +0000 (11:25 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Mar 2007 11:25:47 +0000 (11:25 +0000)
     and '40bad367ae1fefd425dbef847df2559f3b436b7d'


Trivial merge