merge of '9518b4f4eabaf4a22b686fd2ade256eee6952b47'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 12 Apr 2007 09:45:05 +0000 (09:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 12 Apr 2007 09:45:05 +0000 (09:45 +0000)
     and 'caf171b00ab12ba420cb827d1a33a5d972e3b4df'


Trivial merge