Somehow a bunch of files got confused in the sourceforge CVS area, perhaps due to an "anoncvs" lock problem earlier this morning. I think everything is ok now -- please let me know if you notice anything awry.