Merge with http://www.liacs.nl/~sverdool/git.git#cvs2git