merge of 'a493ab6d3816df87b73bd14750c0ae4c366680be'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Mar 2007 10:09:47 +0000 (10:09 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Mar 2007 10:09:47 +0000 (10:09 +0000)
     and 'd446e3e662963c5cd0c53703564aadc5b3fddc48'


Trivial merge