merge of '7dac8ac92aeba65ca1a74b6ff34b5bcfce5d6ee2'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 8 Aug 2007 11:22:57 +0000 (11:22 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 8 Aug 2007 11:22:57 +0000 (11:22 +0000)
     and '87682066586eade9fec532c4e17ea6c8b242428d'


Trivial merge