Conflicts:
	ChangeLog
	INSTALL
	Makefile.in
	NEWS
	THANKS
	aclocal.m4
	build-aux/config.guess
	build-aux/config.rpath
	build-aux/config.sub
	build-aux/missing
	build-aux/texinfo.tex
	config.hin
	configure
	configure.ac
	lib/Makefile.in
	lib/argp-fmtstream.h
	lib/argp-help.c
	lib/argp-parse.c
	lib/btowc.c
	lib/canonicalize-lgpl.c
	lib/chdir-long.c
	lib/close-stream.c
	lib/closeout.c
	lib/closeout.h
	lib/config.charset
	lib/dirent.in.h
	lib/dirfd.c
	lib/dup-safer.c
	lib/fchdir.c
	lib/fclose.c
	lib/fcntl.in.h
	lib/fd-safer.c
	lib/float.in.h
	lib/fseeko.c
	lib/getcwd.c
	lib/getdate.c
	lib/getdate.y
	lib/getdelim.c
	lib/gettimeofday.c
	lib/gnulib.mk
	lib/inttostr.c
	lib/inttostr.h
	lib/inttypes.in.h
	lib/localcharset.c
	lib/lstat.c
	lib/mbscasecmp.c
	lib/memrchr.c
	lib/mktime.c
	lib/open-safer.c
	lib/openat-die.c
	lib/openat.c
	lib/quotearg.c
	lib/regcomp.c
	lib/regex_internal.c
	lib/regex_internal.h
	lib/regexec.c
	lib/rpmatch.c
	lib/size_max.h
	lib/stdarg.in.h
	lib/stdbool.in.h
	lib/stdint.in.h
	lib/stdio.in.h
	lib/stdlib.in.h
	lib/strchrnul.c
	lib/strerror.c
	lib/string.in.h
	lib/strings.in.h
	lib/sys_stat.in.h
	lib/sys_time.in.h
	lib/sysexits.in.h
	lib/time.in.h
	lib/unistd.in.h
	lib/uniwidth/width.c
	lib/utimens.c
	lib/vasnprintf.c
	lib/version-etc.c
	lib/version-etc.h
	lib/wchar.in.h
	lib/wctype.in.h
	lib/xalloc.h
	lib/xmalloc.c
	m4/alloca.m4
	m4/argp.m4
	m4/bison.m4
	m4/canonicalize-lgpl.m4
	m4/chown.m4
	m4/clock_time.m4
	m4/codeset.m4
	m4/d-ino.m4
	m4/dirfd.m4
	m4/double-slash-root.m4
	m4/eealloc.m4
	m4/environ.m4
	m4/extensions.m4
	m4/fchdir.m4
	m4/fcntl_h.m4
	m4/fileblocks.m4
	m4/fnmatch.m4
	m4/fpending.m4
	m4/ftruncate.m4
	m4/getcwd-abort-bug.m4
	m4/getcwd-path-max.m4
	m4/getdate.m4
	m4/getdelim.m4
	m4/getline.m4
	m4/getopt.m4
	m4/gettext.m4
	m4/gettime.m4
	m4/gettimeofday.m4
	m4/glibc21.m4
	m4/gnulib-common.m4
	m4/gnulib-comp.m4
	m4/iconv.m4
	m4/include_next.m4
	m4/inline.m4
	m4/intlmacosx.m4
	m4/intmax_t.m4
	m4/inttypes-pri.m4
	m4/inttypes.m4
	m4/inttypes_h.m4
	m4/lchown.m4
	m4/lib-ld.m4
	m4/lib-link.m4
	m4/lib-prefix.m4
	m4/localcharset.m4
	m4/longlong.m4
	m4/lstat.m4
	m4/malloc.m4
	m4/mbiter.m4
	m4/mbrtowc.m4
	m4/mbscasecmp.m4
	m4/mbstate_t.m4
	m4/mempcpy.m4
	m4/memrchr.m4
	m4/mkdtemp.m4
	m4/mktime.m4
	m4/nls.m4
	m4/openat.m4
	m4/pathmax.m4
	m4/po.m4
	m4/progtest.m4
	m4/quotearg.m4
	m4/readlink.m4
	m4/realloc.m4
	m4/regex.m4
	m4/rpmatch.m4
	m4/save-cwd.m4
	m4/setenv.m4
	m4/sleep.m4
	m4/snprintf.m4
	m4/stat-time.m4
	m4/stdbool.m4
	m4/stdint.m4
	m4/stdint_h.m4
	m4/stdio_h.m4
	m4/stdlib_h.m4
	m4/stpcpy.m4
	m4/strcase.m4
	m4/strchrnul.m4
	m4/strdup.m4
	m4/strerror.m4
	m4/string_h.m4
	m4/strndup.m4
	m4/strnlen.m4
	m4/strtoimax.m4
	m4/strtol.m4
	m4/strtoll.m4
	m4/strtoul.m4
	m4/strtoull.m4
	m4/strtoumax.m4
	m4/sys_stat_h.m4
	m4/tm_gmtoff.m4
	m4/unistd_h.m4
	m4/unlinkdir.m4
	m4/unlocked-io.m4
	m4/utimbuf.m4
	m4/utime.m4
	m4/utimens.m4
	m4/utimes-null.m4
	m4/utimes.m4
	m4/vasnprintf.m4
	m4/vsnprintf.m4
	m4/wchar.m4
	m4/wchar_t.m4
	m4/wctype.m4
	m4/wcwidth.m4
	m4/wint_t.m4
	m4/xsize.m4
	po/bg.gmo
	po/bg.po
	po/cs.gmo
	po/cs.po
	po/da.gmo
	po/da.po
	po/de.gmo
	po/de.po
	po/el.gmo
	po/el.po
	po/es.gmo
	po/es.po
	po/et.gmo
	po/et.po
	po/eu.gmo
	po/eu.po
	po/fi.gmo
	po/fi.po
	po/fr.gmo
	po/fr.po
	po/ga.gmo
	po/ga.po
	po/gl.gmo
	po/gl.po
	po/hr.gmo
	po/hr.po
	po/hu.gmo
	po/hu.po
	po/id.gmo
	po/id.po
	po/it.gmo
	po/it.po
	po/ja.gmo
	po/ja.po
	po/ko.gmo
	po/ko.po
	po/ky.gmo
	po/ky.po
	po/ms.gmo
	po/ms.po
	po/nb.gmo
	po/nb.po
	po/nl.gmo
	po/nl.po
	po/pl.gmo
	po/pl.po
	po/pt.gmo
	po/pt.po
	po/pt_BR.gmo
	po/pt_BR.po
	po/ro.gmo
	po/ro.po
	po/ru.gmo
	po/ru.po
	po/sk.gmo
	po/sk.po
	po/sl.gmo
	po/sl.po
	po/sv.gmo
	po/sv.po
	po/tar.pot
	po/tr.gmo
	po/tr.po
	po/uk.gmo
	po/uk.po
	po/vi.gmo
	po/vi.po
	po/zh_CN.gmo
	po/zh_CN.po
	po/zh_TW.gmo
	po/zh_TW.po
	rmt/Makefile.in
	scripts/Makefile.in
	src/Makefile.in
	src/buffer.c
	src/checkpoint.c
	src/common.h
	src/create.c
	src/extract.c
	src/incremen.c
	src/list.c
	src/names.c
	src/suffix.c
	src/system.c
	src/tar.c
	src/transform.c
	src/xheader.c
	tests/Makefile.am
	tests/Makefile.in
	tests/atlocal.in
	tests/delete05.at
	tests/genfile.c
	tests/gzip.at
	tests/ignfail.at
	tests/incremental.at
	tests/listed01.at
	tests/longv7.at
	tests/lustar01.at
	tests/lustar02.at
	tests/multiv05.at
	tests/package.m4
	tests/pipe.at
	tests/shortfile.at
	tests/shortrec.at
	tests/sparsemv.at
	tests/sparsemvp.at
	tests/testsuite
	tests/testsuite.at
	tests/volsize.at