merge of '63c0f4548dc8826fb967782c39dc4105c3c47268'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Jul 2007 09:16:40 +0000 (09:16 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Jul 2007 09:16:40 +0000 (09:16 +0000)
     and '64e29cad38ed69d47fd10e8377bb3dd1e4db161b'


Trivial merge