Merge branch 'maint'

* maint:
  maintcheck: fix maintainer-check failures, both real and spurious

diff --cc ChangeLog
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge