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

diff --cc git-cvsimport-script
index f71da43c321310d60e765dce11a6bce884350a0d,cdf989161435fd9bbc4791ae4a227be199b6dfae..4c0333b9290a15d6222f68b6397fc456116854cd
--- 1/git-cvsimport-script
--- 2/git-cvsimport-script
+++ b/git-cvsimport-script
@@@ -38,7 -40,7 +40,7 @@@ EN
        exit(1);
  }
  
- getopts("hvo:d:p:C:") or usage();
 -getopts("hqvo:d:p:C:z:") or usage();
++getopts("hvo:d:p:C:z:") or usage();
  usage if $opt_h;
  
  @ARGV <= 1 or usage();