merged CVS and Subversion versions