tree d5ee9d5e7d638a2bcf1037363a6109cdfbc61421
parent ccc7cf032852dd5c84b227bafb481b1d158e2b5e
parent 73fbe2323af6a2b4d807c80069657bf1449b3bff
author Theodore Ts'o <tytso@mit.edu> 1285382421 -0400
committer Theodore Ts'o <tytso@mit.edu> 1285382421 -0400

Merge branch 'maint' into next

Conflicts:
	configure
	configure.in
	lib/ext2fs/ext2fs.h
	misc/mke2fs.c