merge of '6828c0e5742385a5f78150f5504e1690ea6c4111'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 13 Feb 2008 10:55:47 +0000 (10:55 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 13 Feb 2008 10:55:47 +0000 (10:55 +0000)
     and 'f26d3059129388297f1542283ce17d100f8c8acc'


Trivial merge