Merge branch 'maint'

* maint:
  Makefile: Fix 'clean' rule

Conflicts:
	Makefile

diff --cc Makefile
index 1b2e8edb22a15b7e718a3a58c895f92b3f487008,61f6e8d151092bb4468dedda7abcd224fedec913..5a317a6c974eec075e9e5a35cad43566204bfa59
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -146,9 -145,6 +146,9 @@@ clean: Documentation/clea
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
                bup bup-* cmd/bup-* lib/bup/_version.py randomgen memtest \
 -              out[12] out2[tc] tags[12] tags2[tc]
 +              out[12] out2[tc] tags[12] tags2[tc] \
 +              testfs.img lib/bup/t/testfs.img
-       chmod u+rwx lib/bup/t/pybuptest.tmp
+       [ -d lib/bup/t/pybuptest.tmp ] && chmod u+rwx lib/bup/t/pybuptest.tmp || true
        rm -rf *.tmp t/*.tmp lib/*/*/*.tmp build lib/bup/build
 +      if test -e testfs; then rmdir testfs; fi
 +      if test -e lib/bup/t/testfs; then rmdir lib/bup/t/testfs; fi