Merge branch 'maint' into next

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

Thu, 16 May 2013 15:05:37 +0000 (11:05 -0400)

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

Thu, 16 May 2013 15:05:37 +0000 (11:05 -0400)
author Theodore Ts'o <tytso@mit.edu>
Thu, 16 May 2013 15:05:37 +0000 (11:05 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Thu, 16 May 2013 15:05:37 +0000 (11:05 -0400)
diff --cc configure
Simple merge
diff --cc e2fsck/journal.c
Simple merge
diff --cc e2fsck/pass1.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Thu, 16 May 2013 15:05:37 +0000 (11:05 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 16 May 2013 15:05:37 +0000 (11:05 -0400)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/journal.c	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1.c	patch \|	diff1 \|	diff2 \|	blob \| history