merge of '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Jan 2008 11:58:39 +0000 (11:58 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Jan 2008 11:58:39 +0000 (11:58 +0000)
     and 'e2acd7ca2afd3b646c7321798cc2ae3307bd951f'


Trivial merge