Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc aclocal.m4
Simple merge

diff --cc configure
index f05818ee9a5d5aed236df379c60b8d331b2e7a2f,5dd8a9af38c03ad42102e7d5ddaf0fe21ebfcddf..76c524c4aadf7776848b202a602ab01c8d92ee79
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for GNU Automake 1.11a.
 -# Generated by GNU Autoconf 2.64 for GNU Automake 1.11.
++# Generated by GNU Autoconf 2.64 for GNU Automake 1.11a.
  #
  # Report bugs to <bug-automake@gnu.org>.
  #
@@@ -596,9 -549,10 +549,10 @@@ MAKEFLAGS
  # Identity of this package.
  PACKAGE_NAME='GNU Automake'
  PACKAGE_TARNAME='automake'
 -PACKAGE_VERSION='1.11'
 -PACKAGE_STRING='GNU Automake 1.11'
 +PACKAGE_VERSION='1.11a'
 +PACKAGE_STRING='GNU Automake 1.11a'
  PACKAGE_BUGREPORT='bug-automake@gnu.org'
+ PACKAGE_URL='http://www.gnu.org/software/automake/'
  
  ac_unique_file="automake.in"
  ac_subst_vars='LTLIBOBJS
@@@ -1376,11 -1322,10 +1322,10 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
 -GNU Automake configure 1.11
 +GNU Automake configure 1.11a
- generated by GNU Autoconf 2.63
+ generated by GNU Autoconf 2.64
  
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2009 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@@ -1390,8 -1339,8 +1339,8 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
 -It was created by GNU Automake $as_me 1.11, which was
 +It was created by GNU Automake $as_me 1.11a, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ generated by GNU Autoconf 2.64.  Invocation command line was
  
    $ $0 $@
  
@@@ -3308,8 -3277,8 +3277,8 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
 -This file was extended by GNU Automake $as_me 1.11, which was
 +This file was extended by GNU Automake $as_me 1.11a, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ generated by GNU Autoconf 2.64.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -3358,11 -3330,11 +3330,11 @@@ General help using GNU software: <http:
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
 -GNU Automake config.status 1.11
 +GNU Automake config.status 1.11a
- configured by $0, generated by GNU Autoconf 2.63,
+ configured by $0, generated by GNU Autoconf 2.64,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2009 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  

diff --cc doc/Makefile.in
Simple merge

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

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

diff --cc lib/Makefile.in
Simple merge

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

diff --cc m4/Makefile.in
Simple merge

diff --cc tests/Makefile.in
Simple merge