merge of '89bba7eb47ad2f3eb9ac364f1e647d914b007772'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 16:20:07 +0000 (16:20 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 16:20:07 +0000 (16:20 +0000)
     and 'c590a6aeacecad0f59f2b80123eab8bc3737935e'


Trivial merge