Merge branch 'master'

diff --git a/Makefile b/Makefile
index e5cf5ef473e6fbad79707839fff91b029c13f54c..819c48ce8b4b6ae8389f401749d4fe0e34eaad9a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -466,7 +466,7 @@ deb: dist
 ### 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)