Merge branch 'master'

diff --combined Makefile
index e5cf5ef,3bdd059..819c48c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -50,7 -50,7 +50,7 @@@
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-cache perspective.
  
 -GIT_VERSION = 0.99.9.GIT
 +GIT_VERSION = 0.99.9j
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@@ -466,7 -466,7 +466,7 @@@ deb: dis
  ### Cleaning rules
  
  clean:
-       rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE)
+       rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o git $(PROGRAMS) $(LIB_FILE)
        rm -f $(filter-out gitk,$(SCRIPTS))
        rm -f *.spec *.pyc *.pyo
        rm -rf $(GIT_TARNAME)