merge of '038f91aa279cf1b9a1f4f7bd7988f3768ee86ff0'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 20 May 2007 11:23:31 +0000 (11:23 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 20 May 2007 11:23:31 +0000 (11:23 +0000)
     and '56dd632a3a9de2d8f4b9d335e96a43648c9cd3bd'


Trivial merge