Merge branch 'maint'

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

Wed, 21 May 2008 20:56:42 +0000 (16:56 -0400)

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

Wed, 21 May 2008 20:56:42 +0000 (16:56 -0400)
author Theodore Ts'o <tytso@mit.edu>
Wed, 21 May 2008 20:56:42 +0000 (16:56 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Wed, 21 May 2008 20:56:42 +0000 (16:56 -0400)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc doc/libext2fs.texinfo
Simple merge
diff --cc lib/blkid/probe.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Wed, 21 May 2008 20:56:42 +0000 (16:56 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Wed, 21 May 2008 20:56:42 +0000 (16:56 -0400)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
doc/libext2fs.texinfo	patch \|	diff1 \|	diff2 \|	blob \| history
lib/blkid/probe.c	patch \|	diff1 \|	diff2 \|	blob \| history