merge of '053d742c2229e2b07ec4091286904c0972494f3c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 14:38:39 +0000 (14:38 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 14:38:39 +0000 (14:38 +0000)
     and 'b3af45890d6f25fd694e2af28fd291018aaecd2a'


Trivial merge