merge of 0c62f25e84f8a78969b680d2d89b88b32c540d8a
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Aug 2006 16:22:50 +0000 (16:22 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Aug 2006 16:22:50 +0000 (16:22 +0000)
     and befec029b0968612722681e4b1bad74128e981d6


Trivial merge