Merge from trunk.

1 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 17b6bae02cc..01fee7035b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-05  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Assume support for memcmp, memcpy, memmove, memset.
         This simplifies the code a bit.  All current platforms have these,
@@ -6,6 +6,10 @@
         can add the gnulib modules for these (a 1-line change to Makefile.in).
         * configure.in: Don't check for memcmp, memcpy, memmove, memset.
 
+2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.
+
 2011-07-01  Glenn Morris  <rgm@gnu.org>
 
         * configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.