merge of '0ae58917d460020990b038630d35c74df4f95059'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 24 Oct 2007 15:00:20 +0000 (15:00 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 24 Oct 2007 15:00:20 +0000 (15:00 +0000)
     and '29ae2e348466eb7f810574927b181421a8412e70'


Trivial merge