Merge branch 'maint' into next

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

Sun, 10 Feb 2008 13:03:54 +0000 (08:03 -0500)

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

Sun, 10 Feb 2008 13:03:54 +0000 (08:03 -0500)
author Theodore Ts'o <tytso@mit.edu>
Sun, 10 Feb 2008 13:03:54 +0000 (08:03 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Sun, 10 Feb 2008 13:03:54 +0000 (08:03 -0500)
diff --cc debian/rules
Simple merge
diff --cc doc/libext2fs.texinfo
Simple merge
diff --cc e2fsck/unix.c
Simple merge
diff --cc lib/blkid/probe.c
Simple merge
diff --cc misc/Makefile.in
Simple merge
diff --cc misc/tune2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Sun, 10 Feb 2008 13:03:54 +0000 (08:03 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Sun, 10 Feb 2008 13:03:54 +0000 (08:03 -0500)
		1	2
debian/rules	patch \|	diff1 \|	diff2 \|	blob \| history
doc/libext2fs.texinfo	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/blkid/probe.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history