Merge commit 'upstream/1.3.12'

Merge commit 'upstream/1.3.12'

Conflicts:

	CHANGES
	Makefile.in
	README.win32
	config.guess
	config.sub
	configure
	debian/changelog
	debian/compat
	debian/control
	debian/copyright
	loaderinfo.c
	mam2debug.c
	mam2debug2.c
	mtx.1
	mtx.c
	mtx.h
	mtx.spec
	mtx.spec.in
	mtxl.c
	mtxl.h
	nsmhack.c
	scsi_aix.c
	scsi_freebsd.c
	scsi_hpux.c
	scsi_linux.c
	scsi_sgi.c
	scsi_sun.c
	scsi_win32.c
	scsieject.1
	scsieject.c
	scsitape.c
	sg_err.c
	tapeinfo.1
	tapeinfo.c