Merge branch 'master' of /home/simonmar/ghc-git/.

diff --combined sync-all
index c4ecfa3,bd32e46..d20f4e7
--- 1/sync-all
--- 2/sync-all
+++ b/sync-all
@@@ -262,6 -262,7 +262,6 @@@ sub scmall 
      }
  
      push(@args, @_);
 -    print "args: @args\n";
  
      for $line (@packages) {
  
@@@ -353,6 -354,11 +353,11 @@@
                      @scm_args = ("remote", "set-url", $branch_name, $path);
                  }
              }
+             elsif ($command =~ /^grep$/) {
+               @scm_args = ("grep");
+               # Hack around 'git grep' failing if there are no matches
+               $ignore_failure = 1;
+             }
              else {
                  die "Unknown command: $command";
              }
@@@ -406,6 -412,7 +411,7 @@@ Supported commands
   * remote add <branch-name>
   * remote rm <branch-name>
   * remote set-url [--push] <branch-name>
+  * grep
  
  Available package-tags are:
  END