Merge branch 'maint' into next

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

Mon, 15 Oct 2007 20:24:56 +0000 (16:24 -0400)

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

Mon, 15 Oct 2007 20:24:56 +0000 (16:24 -0400)
author Theodore Ts'o <tytso@mit.edu>
Mon, 15 Oct 2007 20:24:56 +0000 (16:24 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Mon, 15 Oct 2007 20:24:56 +0000 (16:24 -0400)
diff --cc lib/blkid/probe.c
Simple merge
diff --cc misc/mke2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Mon, 15 Oct 2007 20:24:56 +0000 (16:24 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 15 Oct 2007 20:24:56 +0000 (16:24 -0400)
		1	2
lib/blkid/probe.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history