Merge branch 'aw/cvs'

* aw/cvs:
  cvsimport: add <remote>/HEAD reference in separate remotes more
  cvsimport: update documentation to include separate remotes option
  cvsimport: add support for new style remote layout

diff --cc Documentation/git-cvsimport.txt
Simple merge

diff --cc git-cvsimport.perl
index 75d65d4,598b9c8..433b7fd
--- 1/git-cvsimport.perl
--- 2/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@@ -520,9 -528,9 +528,9 @@@ sub is_sha1 
  
  sub get_headref ($$) {
      my $name    = shift;
 -    my $git_dir = shift; 
 -    
 +    my $git_dir = shift;
 +
-     my $f = "$git_dir/refs/heads/$name";
+     my $f = "$git_dir/$remote/$name";
      if (open(my $fh, $f)) {
            chomp(my $r = <$fh>);
            is_sha1($r) or die "Cannot get head id for $name ($r): $!";