merge from gcc

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 20aaed3..8460b3d 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * aclocal.m4: Regenerate.
+
 2009-10-15  Jim Blandy  <jimb@red-bean.com>
 
        * libgnuintl.h (_INTL_MAY_RETURN_STRING_ARG, gettext, dgettext)

diff --git a/intl/aclocal.m4 b/intl/aclocal.m4
index fbc70f8..7bbc56a 100644 (file)
--- a/intl/aclocal.m4
+++ b/intl/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index b218e42..a0c2953 100644 (file)
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * aclocal.m4: Regenerate.
+
 2010-01-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * configure: Regenerate.

diff --git a/libdecnumber/aclocal.m4 b/libdecnumber/aclocal.m4
index ee85297..7dc0312 100644 (file)
--- a/libdecnumber/aclocal.m4
+++ b/libdecnumber/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.