merge of 1ce847551d29aa89a9004dbe9df99547f6f93e3f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 18 Aug 2006 13:47:57 +0000 (13:47 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 18 Aug 2006 13:47:57 +0000 (13:47 +0000)
     and f8625e808b1d66ff2a469a04339e27914d59c4e5


Trivial merge