Import v2.61
Merge tag 'v2.61'

Import v2.61

Conflicts:
	Makefile.in
	bin/Makefile.in
	build-aux/texinfo.tex
	config/Makefile.in
	configure.ac
	doc/Makefile.in
	doc/autoconf.info
	doc/stamp-vti
	doc/version.texi
	lib/Autom4te/Makefile.in
	lib/Makefile.in
	lib/autoconf/Makefile.in
	lib/autoconf/fortran.m4
	lib/autoconf/libs.m4
	lib/autoscan/Makefile.in
	lib/autotest/Makefile.in
	lib/emacs/Makefile.in
	lib/m4sugar/Makefile.in
	man/Makefile.in
	tests/Makefile.in

Note Makefile.in's all reverted to vendor.