merge from gcc

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 20aaed376b0777e396f6fc03873993e8a93c93eb..8460b3d554da580faa52b38820fe1350a5016d86 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 fbc70f86d8bbbadab29b323853c8498eb9df432c..7bbc56a3959c7b8f9ad9fe11b513a0ca24b83bc5 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 b218e422918235d324290bf06ee90d819f3c5d34..a0c2953945c8bc026f0cc428eb464da2ffb085fd 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 ee8529730a62557f6880e6617924183db1177fd0..7dc0312687f5c3a06bd0320d41802f44c9a5e521 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.