Update after move from cvs to git.