Merge branch 'maint' into next

author Theodore Ts'o <tytso@mit.edu>

Mon, 7 Sep 2009 21:02:35 +0000 (17:02 -0400)

committer Theodore Ts'o <tytso@mit.edu>

Mon, 7 Sep 2009 21:02:35 +0000 (17:02 -0400)
author Theodore Ts'o <tytso@mit.edu>
Mon, 7 Sep 2009 21:02:35 +0000 (17:02 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Mon, 7 Sep 2009 21:02:35 +0000 (17:02 -0400)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc e2fsck/unix.c
Simple merge
diff --cc lib/ext2fs/gen_bitmap.c
Simple merge
diff --cc lib/ext2fs/mkjournal.c
Simple merge
diff --cc misc/dumpe2fs.c
Simple merge
diff --cc resize/resize2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Mon, 7 Sep 2009 21:02:35 +0000 (17:02 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 7 Sep 2009 21:02:35 +0000 (17:02 -0400)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/gen_bitmap.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/mkjournal.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/dumpe2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
resize/resize2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history