Merge branch 'master' of .

diff --combined Makefile
index f13ff5aa29ef9ade4d9652c970b79053b47d2d0d,9aa0c9a4f1423ab50ee02165987b553b0f8de641..033c96e8f1c5ea3ebfa99d4c7ada0e677bf85fc2
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.5
 +GIT_VERSION = 0.99.6
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@@ -65,12 -65,13 +65,13 @@@ SCRIPTS=git git-merge-one-file-script g
        gitk git-cherry git-rebase-script git-relink-script git-repack-script \
        git-format-patch-script git-sh-setup-script git-push-script \
        git-branch-script git-parse-remote-script git-verify-tag-script \
-       git-ls-remote-script git-clone-dumb-http git-rename-script \
+       git-ls-remote-script git-rename-script \
        git-request-pull-script git-bisect-script
  
  SCRIPTS += git-count-objects-script
  SCRIPTS += git-revert-script
  SCRIPTS += git-octopus-script
+ SCRIPTS += git-archimport-script
  
  PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \