merge of 02201a31a371cb4632ab2389a885f4c37494a1eb
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Aug 2006 00:25:26 +0000 (00:25 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Aug 2006 00:25:26 +0000 (00:25 +0000)
     and 27ccadac8de1a506e26898f5e97c53a9b9bcb534


Trivial merge