merge of '8ce7c583143e7bf2db21265ca891d4da719d7794'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 15:01:23 +0000 (15:01 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 15:01:23 +0000 (15:01 +0000)
     and 'a050f1c853248f45a95f9a5f763ae9523d585533'


Trivial merge