merge of '30d6a9a8f183fa3269a65f234e3bf92f0da8eff5'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 16 Nov 2007 18:24:30 +0000 (18:24 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 16 Nov 2007 18:24:30 +0000 (18:24 +0000)
     and '63a3f2a77fbdf77ef9318ceb182fd3be38d68562'


Trivial merge