merged final cvs changes to git