updated for git with some CVS checkout