merge of '7d50f2e0aeefca053ef8407566020fd864a8b12c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 22:56:04 +0000 (22:56 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 22:56:04 +0000 (22:56 +0000)
     and '9f65c4ed11c11a2fcee190fbb54330e3e5ddec37'


Trivial merge