Merge branch 'maint'

diff --cc ChangeLog
index 456b8b4306e2e3cf023670583e961549ce170d35,991ed0bb8d44b91dd0aa1fb580aba0c85ed08915..5b666d77073eb446ed9108e9ae5d11c0d3e1ce87
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,23 +1,30 @@@
+ 2011-03-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
+       * tests/comments-in-var-defn.test: The configure.in stub created
+       by default, which has the AC_INIT first argument obtained by the
+       test name, causes autoconf 2.62 to fail with a spurious error
+       message like: "configure.in:1: error: defn: undefined macro:".
+       Thus, to prevent this, the test is renamed to ...
+       * tests/comments-in-var-def.test: ... this.
+       * tests/Makefile.am (TESTS): Updated.
+ 
+ 2011-03-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       cosmetics: convert encoding from ISO-8859 to UTF-8
+       * ChangeLog.03: Convert encoding to UTF-8.
+       * ChangeLog.96: Likewise.
+       * ChangeLog.98: Likewise.
+       * NEWS: Likewise.
+       * TODO: Likewise.
+ 
 +2011-03-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: extend checks on the 'unindent' shell function
 +      * tests/self-check-unindent.test: Also check that multiple
 +      instances of 'unindent' can run in parallel (this was not
 +      the case when that function used temporary files).
 +
  2011-03-01  Peter Rosin  <peda@lysator.liu.se>
  
        test defs: unindent without temporary file

diff --cc NEWS
Simple merge

diff --cc tests/Makefile.am
index 8692de561dac5e6fc4c25ab42f640fe78ed7feb9,3fdb90aad0e86163288f831fc0c25eff53bb7d0a..c0efdc37e8d80f18162421a87c0b9fe514680366
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -249,16 -169,11 +249,16 @@@ comment8.test 
  comment9.test \
  commen10.test \
  commen11.test \
- comments-in-var-defn.test \
+ comments-in-var-def.test \
  compile.test \
  compile2.test \
 +compile3.test \
 +compile4.test \
 +compile5.test \
 +compile6.test \
  compile_f90_c_cxx.test \
  compile_f_c_cxx.test \
 +cond-basic.test \
  cond.test \
  cond2.test \
  cond3.test \

diff --cc tests/Makefile.in
index 8a258793c759a6bc90ef58605915c70b482ad895,cd008336ad916c9ab0bac3df0ec53035d52aa17f..311b5240295cab09a4f28b7f829ca3c3eb58a6e8
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -511,16 -439,11 +511,16 @@@ comment8.test 
  comment9.test \
  commen10.test \
  commen11.test \
- comments-in-var-defn.test \
+ comments-in-var-def.test \
  compile.test \
  compile2.test \
 +compile3.test \
 +compile4.test \
 +compile5.test \
 +compile6.test \
  compile_f90_c_cxx.test \
  compile_f_c_cxx.test \
 +cond-basic.test \
  cond.test \
  cond2.test \
  cond3.test \

diff --cc tests/comments-in-var-def.test
Simple merge