Merge branch 'maint'

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

Sat, 4 Aug 2007 03:21:34 +0000 (23:21 -0400)

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

Sat, 4 Aug 2007 03:21:34 +0000 (23:21 -0400)
author Theodore Ts'o <tytso@mit.edu>
Sat, 4 Aug 2007 03:21:34 +0000 (23:21 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Sat, 4 Aug 2007 03:21:34 +0000 (23:21 -0400)
diff --cc e2fsck/e2fsck.h
Simple merge
diff --cc e2fsck/pass1.c
Simple merge
diff --cc e2fsck/unix.c
Simple merge
diff --cc misc/Makefile.in
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Sat, 4 Aug 2007 03:21:34 +0000 (23:21 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Sat, 4 Aug 2007 03:21:34 +0000 (23:21 -0400)
		1	2
e2fsck/e2fsck.h	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1.c	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history