Merge from mainline.

1 files changed, 26 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 649fe4b2ba6..85165338460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-08  Paul Eggert  <eggert@cs.ucla.edu>
+2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         Import getloadavg module from gnulib.
         * .bzrignore: Add lib/stdlib.h.
@@ -19,6 +19,31 @@
         * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
         * src/config.in: Regenerate.
 
+2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
+        Sync from gnulib, which has been patched to fix the problem
+        with the license notices.  Problem reported by Glenn Morris in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00403.html>.
+
+2011-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * .bzrignore: Ignore globals.h and related stamp.
+
+2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lib/Makefile.in, lib/gnulib.mk: Regenerate.
+        This merges the following fix from gnulib:
+
+        2011-02-08  Bruno Haible  <bruno@clisp.org>
+
+        Split large sed scripts, for HP-UX sed.
+
+2011-02-08  Tom Tromey  <tromey@redhat.com>
+
+        * configure: Rebuild.
+        * configure.in (NS_OBJC_OBJ): New subst.
+
 2011-02-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         gnulib: allow multiple gnulib generated replacements to coexist