Merge commit 'upstream/1.4'

Merge commit 'upstream/1.4'

Conflicts:
	COPYING
	ChangeLog
	INSTALL
	Makefile.am
	Makefile.in
	NEWS
	README
	README-alpha
	TODO
	aclocal.m4
	bits.c
	build-aux/compile
	build-aux/config.guess
	build-aux/config.sub
	build-aux/depcomp
	build-aux/install-sh
	build-aux/mdate-sh
	build-aux/missing
	build-aux/texinfo.tex
	configure
	configure.ac
	crypt.c
	deflate.c
	doc/Makefile.am
	doc/Makefile.in
	doc/fdl.texi
	doc/gzip.info
	doc/gzip.texi
	doc/stamp-vti
	doc/version.texi
	gunzip.in
	gzexe.in
	gzip.c
	gzip.doc
	gzip.h
	inflate.c
	lib/Makefile.am
	lib/Makefile.in
	lib/config.hin
	lib/creat-safer.c
	lib/dup-safer.c
	lib/error.c
	lib/error.h
	lib/exitfail.c
	lib/exitfail.h
	lib/fcntl--.h
	lib/fcntl-safer.h
	lib/fd-safer.c
	lib/getopt.c
	lib/getopt1.c
	lib/getopt_.h
	lib/getopt_int.h
	lib/gettext.h
	lib/gnulib.mk
	lib/match.c
	lib/open-safer.c
	lib/pipe-safer.c
	lib/stat-time.h
	lib/unistd--.h
	lib/unistd-safer.h
	lib/utimens.c
	lib/utimens.h
	lib/xalloc-die.c
	lib/xalloc.h
	lib/xmalloc.c
	lib/yesno.c
	lib/yesno.h
	lzw.c
	lzw.h
	m4/error.m4
	m4/exitfail.m4
	m4/extensions.m4
	m4/fcntl-safer.m4
	m4/fcntl_h.m4
	m4/getopt.m4
	m4/gnulib-common.m4
	m4/gnulib-comp.m4
	m4/inline.m4
	m4/shell.m4
	m4/stat-time.m4
	m4/stdbool.m4
	m4/stdlib_h.m4
	m4/sys_stat_h.m4
	m4/sys_time_h.m4
	m4/time_h.m4
	m4/unistd-safer.m4
	m4/unistd_h.m4
	m4/utimbuf.m4
	m4/utimens.m4
	m4/utimes.m4
	m4/xalloc.m4
	m4/yesno.m4
	revision.h
	tailor.h
	trees.c
	unlzh.c
	unlzw.c
	unpack.c
	unzip.c
	util.c
	zcat.in
	zcmp.in
	zdiff.in
	zegrep.in
	zfgrep.in
	zforce.in
	zgrep.in
	zip.c
	zless.1
	zless.in
	zmore.in
	znew.in