merge of '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 09:59:37 +0000 (09:59 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 09:59:37 +0000 (09:59 +0000)
     and '5315b48797a90da8300454374f0e8dd43d8b3658'


Trivial merge