merge of 635cbb19e0568d65029138d49de7e16737269724
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 7 Aug 2006 14:42:33 +0000 (14:42 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 7 Aug 2006 14:42:33 +0000 (14:42 +0000)
     and f5124452885299a376f34aacc5a24848ccafde47


Trivial merge