merge of '9825e252e64e709a5ee477d7bd717c6c8fe00957'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 08:30:35 +0000 (08:30 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 08:30:35 +0000 (08:30 +0000)
     and 'd92d9487ef2a7ae3fc192bb7d44696ed3970a0f2'


Trivial merge