merge of '30fdc7758a8b7a86b7d59101eff9bd0011257d00'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 May 2007 16:28:33 +0000 (16:28 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 May 2007 16:28:33 +0000 (16:28 +0000)
     and '9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f'


Trivial merge