merge of '1363ef74e5eef89aecd3b1cd42142546b27d3d6a'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 10:30:21 +0000 (10:30 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 10:30:21 +0000 (10:30 +0000)
     and '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'


Trivial merge