Merge tag '0.25-rc5' into debian

0.25-rc5

diff --cc Makefile
index 1978c46543ad36037c838f89ee41b10666721465,5c0cf6c6edb3bb4317be6a3651858ecd27380b1d..de676a6c676511227c4482fa63c40c3e5e444e23
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -6,9 -6,15 +6,15 @@@ ifeq ($(OS),CYGWIN
    SOEXT:=.dll
  endif
  
+ ifdef TMPDIR
+   test_tmp := $(TMPDIR)
+ else
+   test_tmp := $(CURDIR)/t/tmp
+ endif
+ 
  default: all
  
 -all: bup Documentation/all
 +all: bup
        t/configure-sampledata --setup
  
  bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds