From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 2 Aug 2009 00:43:00 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.41.90.wc1~108
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=baa8dbeb4e4acef9563d8aac61c01ec7c3a8c8ea;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	misc/Makefile.in
---

baa8dbeb4e4acef9563d8aac61c01ec7c3a8c8ea
diff --cc misc/Makefile.in
index 5f5dab5,3076f67..5d9af4d
--- a/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