merge of '2fe65e7dd5b612b8e4cc4b42152fc78d586840d1'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Apr 2007 16:52:23 +0000 (16:52 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Apr 2007 16:52:23 +0000 (16:52 +0000)
     and '77ed88b5160a49676a33c55d5f381799bfd7f027'


Trivial merge