merge of 'b3d0613a356ef781ed84bdb1cd373059e4210cdd'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 21 Feb 2007 18:01:42 +0000 (18:01 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 21 Feb 2007 18:01:42 +0000 (18:01 +0000)
     and 'fdb255e34cd549183839104f92b3ec4651d31fab'


Trivial merge