merge of '93691535aba89a9ed8c657fdc80e62bf1e46e93d'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 09:02:55 +0000 (09:02 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 09:02:55 +0000 (09:02 +0000)
     and 'dfdda7c548b2b8c023a5e9015f79c6f450c91fa3'


Trivial merge