Added the changes previously agreed to between Dean Carlson and Klaus Schneider DAC 15:09, 25 August 2007 (PDT)