merge of '53f259329d14afe6fe60b4952d59f0f5765e7d63'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 16:20:17 +0000 (16:20 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 16:20:17 +0000 (16:20 +0000)
     and '9f53c3a657c02ddf15d8dc46c998112593d06aca'


Trivial merge