Merge from mainline.

1 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d9782015ec..cd9104759d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-14  Paul Eggert  <eggert@cs.ucla.edu>
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
         This avoids building ftoastr and ldtoastr, which aren't needed.  See
@@ -104,6 +104,14 @@
         * make-dist: Also put into the distribution aclocal.m4,
         compile, depcomp, missing, and the files under lib/.
 
+2011-01-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (epaths-force): No more arch-tag to edit.
+
+2011-01-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * configure.in: Bump min libxml2 version to 2.6.17 (Bug#7603).
+
 2011-01-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * make-dist: Distribute test/ files too.
@@ -8813,8 +8821,9 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-        2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
+    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+    Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.