merge of '2bc8a3eb9ed9de9cc86448fe66997525637bb09d'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 28 Aug 2007 10:11:17 +0000 (10:11 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 28 Aug 2007 10:11:17 +0000 (10:11 +0000)
     and '4dafb02cdb0534d362beafb2ee3a1a6e136bc5c2'


Trivial merge