merge of '406806cf65111e556275d6b815ff18a65a152652'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 20 Apr 2007 16:40:13 +0000 (16:40 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 20 Apr 2007 16:40:13 +0000 (16:40 +0000)
     and '431a527e96a2702a0c44c8a370b1bbd0d22f99ee'


Trivial merge