Merge branch 'maint'

diff --cc Makefile.in
Simple merge

diff --cc aclocal.m4
index 01c6b13,d7cbc11..3c960a3
--- 1/aclocal.m4
--- 2/aclocal.m4
+++ b/aclocal.m4
@@@ -1,7 -1,7 +1,7 @@@
 -# generated automatically by aclocal 1.11 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11a -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+ # 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.

diff --cc automake.in
index 1d1f40c,8692d61..482972b
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc doc/Makefile.in
Simple merge

diff --cc doc/automake.texi
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