merge of '9f8dec37506722f0949550fe1cb9c966bcac3ffc'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 May 2007 09:56:41 +0000 (09:56 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 May 2007 09:56:41 +0000 (09:56 +0000)
     and 'b328a484f7f03665eb8b12eb6894b9f90da04b62'


Trivial merge