merge of df84e8f6ddb4607c824cd8dbc63c44ffbb308f9a
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Aug 2006 00:25:31 +0000 (00:25 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Aug 2006 00:25:31 +0000 (00:25 +0000)
     and 3608f3d5434271fde9ce2b2c787339675d8a532f


Trivial merge