merge of '36aafe8bf796c1a22dbb0f206a98273975012f86'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 16:06:34 +0000 (16:06 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 16:06:34 +0000 (16:06 +0000)
     and '97edb3a78d8b0c88ded6a2d1fc1b78a15c1d5b14'


Trivial merge