Merge branch 'maint'

diff --cc aclocal.m4
Simple merge

diff --cc configure
index b52bf2b,ae88625..b7f3e9b
--- 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.65 for GNU Automake 1.11a.
 -# Generated by GNU Autoconf 2.67 for GNU Automake 1.11.
++# Generated by GNU Autoconf 2.67 for GNU Automake 1.11a.
  #
  # Report bugs to <bug-automake@gnu.org>.
  #
@@@ -1335,10 -1326,10 +1336,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.65
+ generated by GNU Autoconf 2.67
  
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@@ -1352,8 -1343,8 +1353,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.65.  Invocation command line was
+ generated by GNU Autoconf 2.67.  Invocation command line was
  
    $ $0 $@
  
@@@ -3305,8 -3292,8 +3314,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.65.  Invocation command line was
+ generated by GNU Autoconf 2.67.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -3360,11 -3347,11 +3369,11 @@@ _ACEO
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
 -GNU Automake config.status 1.11
 +GNU Automake config.status 1.11a
- configured by $0, generated by GNU Autoconf 2.65,
+ configured by $0, generated by GNU Autoconf 2.67,
    with options \\"\$ac_cs_config\\"
  
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."