merge of '06296810795c121aba4a5607d1e6e154bec0c768'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Mar 2007 15:18:33 +0000 (15:18 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Mar 2007 15:18:33 +0000 (15:18 +0000)
     and 'eb7e5bf33c6692e556183f311e95eb606e10c626'


Trivial merge