Merge from trunk.

1 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 62847460778..6aaebbc80e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         Add gnulib support for pthread_sigmask (Bug#9010).
         * Makefile.in (GNULIB_MODULES): Add pthread_sigmask.
@@ -12,6 +12,14 @@
         due to the above changes.
         * .bzrignore: Add lib/signal.h.
 
+2011-07-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * configure.in (maintainer-mode): Reflect default in help string.
+
+2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * configure.in: Remove reference to iris4d.h.
+
 2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
 
         * configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.