merge of '0d4432345566d8f0530a727b921a6e4958412475'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 10:51:19 +0000 (10:51 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 10:51:19 +0000 (10:51 +0000)
     and 'b180e055906b9a23bcd4980e8682b0a7de022179'


Trivial merge