merge of '83d9cf101f881f4f23bd0c33560c2179b08d8874'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Jul 2007 11:01:15 +0000 (11:01 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Jul 2007 11:01:15 +0000 (11:01 +0000)
     and 'beb1fc79f1a536fd48b5ecbd2bdfcb11369d5888'


Trivial merge