merge of '9b61539b8e105d428c07a9a551cc2bec487151bf'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Apr 2007 14:45:57 +0000 (14:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Apr 2007 14:45:57 +0000 (14:45 +0000)
     and 'aff69a14340dd1655bfe774109fde80cc509eed6'


Trivial merge