merge of 'b43a990c14ad8ab39c9290ff13c74413357d3365'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 May 2007 00:17:58 +0000 (00:17 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 May 2007 00:17:58 +0000 (00:17 +0000)
     and 'e39fd671622f6b7d265429c36cb31a14283b6232'


Trivial merge