Merge branch 'maint'

Conflicts:

	lib/ext2fs/ext2_err.et.in