Merge branch 'maint' into next

Conflicts:
	misc/Makefile.in

diff --cc misc/Makefile.in
index 5f5dab557b8827199a1433fb67ae1b55d54f6b28,3076f67e7bf1d53d41d5a27efd5ef82d38f81dd1..5d9af4d4b11cc7a4304d26d3b959a27116ef2657
--- 1/misc/Makefile.in
--- 2/misc/Makefile.in
+++ b/misc/Makefile.in
@@@ -50,7 -50,7 +50,8 @@@ FSCK_OBJS=    fsck.o base_device.o ismount
  BLKID_OBJS=   blkid.o
  FILEFRAG_OBJS=        filefrag.o
  E2UNDO_OBJS=  e2undo.o
 +E4DEFRAG_OBJS=        e4defrag.o
+ E2FREEFRAG_OBJS= e2freefrag.o
  
  PROFILED_TUNE2FS_OBJS=        profiled/tune2fs.o profiled/util.o
  PROFILED_MKLPF_OBJS=  profiled/mklost+found.o