Merge branch 'master' of .

diff --combined Makefile
index e2bbcb5,a851f56..9725b1a
--- 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)
@@@ -83,7 -83,7 +83,7 @@@ SCRIPT_PERL = 
        git-rename.perl git-shortlog.perl
  
  SCRIPT_PYTHON = \
-       git-merge-fredrik.py
+       git-merge-recursive.py
  
  # The ones that do not have to link with lcrypto nor lz.
  SIMPLE_PROGRAMS = \