merge of '9ee75dbc81277b54460c4e8c5212693a1fb2fd03'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 14 Aug 2007 17:40:12 +0000 (17:40 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 14 Aug 2007 17:40:12 +0000 (17:40 +0000)
     and 'ab50357e49cac0db516d16c090278324f3999d80'


Trivial merge