merge of 'd7fd55c2b036fe77aaf2964c99702f65a6833031'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 12 Jul 2007 16:38:16 +0000 (16:38 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 12 Jul 2007 16:38:16 +0000 (16:38 +0000)
     and 'df688aa66e8dd2c9f76bf0b2551461346a1d5981'


Trivial merge