merge of 2e4e17489b3fa4aeb0a87a036efb8b485adec26b
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 1 Aug 2006 16:25:02 +0000 (16:25 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 1 Aug 2006 16:25:02 +0000 (16:25 +0000)
     and 58ff55500be03d6f8ddc5c54027951e93cf4b7a2


Trivial merge