merge of '5281adaea9fd65292934a8ed7fa0e871e220ca7f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 27 Aug 2007 10:08:40 +0000 (10:08 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 27 Aug 2007 10:08:40 +0000 (10:08 +0000)
     and 'db972685a453721f344867c46d01ba28142c82bf'


Trivial merge