Merge branch 'maint' into next

diff --cc misc/fuse2fs.c
Simple merge

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
Simple merge

diff --cc tests/test_one.in
index b20e2074fea9495fa3b5996a582ee9a25a461880,c06211d6929e014581d23d655d87c01f87ba3f41..6ec56f55505ef66d049f2ae1e00f61118ab48b26
--- 1/tests/test_one.in
--- 2/tests/test_one.in
+++ b/tests/test_one.in
@@@ -63,7 -51,9 +60,10 @@@ f
  rm -f $test_name.ok $test_name.failed
  #echo -e -n "$test_name: $test_description:\r"
  
+ TMPFILE=$(mktemp ${TMPDIR:-/tmp}/e2fsprogs-tmp-$test_name.XXXXXX)
+ trap 'rm -f $TMPFILE ; exit' 1 2 15
+ 
 +start=$SECONDS
  if [ -f $test_dir/script ]; then
        . $test_dir/script
  else