merge of '93f0d1fb19b8af1a17b5e5f54901cc7a2886891e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 15 Aug 2007 08:17:22 +0000 (08:17 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 15 Aug 2007 08:17:22 +0000 (08:17 +0000)
     and 'e6927985d5afff00a297233fcc9586893f89b180'


Trivial merge