merge of '7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 30 Jul 2007 21:33:56 +0000 (21:33 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 30 Jul 2007 21:33:56 +0000 (21:33 +0000)
     and 'aaed7d89c2d2f9469b923a2d2d65c83ad37bc838'


Trivial merge