Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc aclocal.in
Simple merge

diff --cc automake.in
index baab7216708b369c62c225174626fcdf0543d9b4,381202b46b98a8edc501a60b6ca2e45e18afe5e1..97280a913e868ca09a93dd8382c4ac7a92e2fe4c
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc configure
Simple merge

diff --cc configure.ac
index bb22e1ce0976803c626b2046e054fd0883ecbbf5,de4583d67ce506b92618c1ec67748df28560f680..079525d625e919fcd85c91e98284cf5656da0fa6
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -16,8 -16,11 +16,11 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -AC_INIT([GNU Automake], [1.11], [bug-automake@gnu.org])
 +AC_INIT([GNU Automake], [1.11a], [bug-automake@gnu.org])
  
+ m4_ifndef([AC_PACKAGE_URL],
+         [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/automake/])])
+ 
  AC_CONFIG_SRCDIR(automake.in)
  AC_CONFIG_AUX_DIR(lib)
  

diff --cc doc/automake.texi
Simple merge

diff --cc lib/Automake/ChannelDefs.pm
Simple merge

diff --cc lib/Automake/Makefile.am
Simple merge

diff --cc lib/Automake/Makefile.in
Simple merge