merge of '90fdf0ac19d7e035c60649e9885973e7f8d0a281'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Aug 2007 16:28:04 +0000 (16:28 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Aug 2007 16:28:04 +0000 (16:28 +0000)
     and 'f9e7fa374cd5f676b9b1a53975d8a55b54caa2c3'


Trivial merge