Merge branch 'master' of .

diff --combined Makefile
index 3f699864ea16556a37de0661bed878c27ee2f18b,9c2bdd642bd7b3e142512f1b71780273351ca514..e2bbcb590ede692b901284b2dae7448352463f7c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -40,7 -40,7 +40,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.6
 +GIT_VERSION = 0.99.7
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@@ -76,7 -76,7 +76,7 @@@ SCRIPT_SH = 
        git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
        git-applymbox.sh git-applypatch.sh \
        git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
-       git-merge-resolve.sh
+       git-merge-resolve.sh git-grep.sh
  
  SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \