Merge branch 'maint'

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

Sat, 15 Mar 2008 05:27:08 +0000 (01:27 -0400)

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

Sat, 15 Mar 2008 05:27:08 +0000 (01:27 -0400)
author Theodore Ts'o <tytso@mit.edu>
Sat, 15 Mar 2008 05:27:08 +0000 (01:27 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Sat, 15 Mar 2008 05:27:08 +0000 (01:27 -0400)
diff --cc doc/libext2fs.texinfo
Simple merge
diff --cc lib/ext2fs/ext2_fs.h
Simple merge
diff --cc lib/ext2fs/swapfs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Sat, 15 Mar 2008 05:27:08 +0000 (01:27 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Sat, 15 Mar 2008 05:27:08 +0000 (01:27 -0400)
		1	2
doc/libext2fs.texinfo	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2_fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/swapfs.c	patch \|	diff1 \|	diff2 \|	blob \| history