merge of '6c10e4e698bad3b70189cebcd53c4381ae45b884'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 23 Apr 2007 16:46:28 +0000 (16:46 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 23 Apr 2007 16:46:28 +0000 (16:46 +0000)
     and '909c507b800748c820ddc73a2c5bed204cbdbd65'


Trivial merge