Merge branch 'maint' into next

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

Mon, 17 Dec 2012 14:58:50 +0000 (09:58 -0500)

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

Mon, 17 Dec 2012 14:58:50 +0000 (09:58 -0500)
author Theodore Ts'o <tytso@mit.edu>
Mon, 17 Dec 2012 14:58:50 +0000 (09:58 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Mon, 17 Dec 2012 14:58:50 +0000 (09:58 -0500)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc e2fsck/pass5.c
Simple merge
diff --cc lib/ext2fs/initialize.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Mon, 17 Dec 2012 14:58:50 +0000 (09:58 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 17 Dec 2012 14:58:50 +0000 (09:58 -0500)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/pass5.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/initialize.c	patch \|	diff1 \|	diff2 \|	blob \| history