merge of '0397dd52df31390bf119eeb7aa7be8c09aec7c3f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Feb 2007 08:34:31 +0000 (08:34 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Feb 2007 08:34:31 +0000 (08:34 +0000)
     and '80e6c1f2e38be33b588e77bffe86e1072cc043e7'


Trivial merge