Merge from mainline.

diff --cc ChangeLog
index 851653384608fef9e4542b0c812e86d8c0e413c2,e5b3b2e8b0828a695a7b74610d44aa3c9fa424cb..52db9f45cd64e5633d217fdddc41fd2fb03cdad6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,24 -1,23 +1,44 @@@
+ 2011-02-15  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Merge from gnulib.
+ 
+       2011-02-13  Bruno Haible  <bruno@clisp.org>
+ 
+       Consistent macro naming for macros that use GCC __attribute__.
+       * lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Renamed from
+       ATTRIBUTE_DEPRECATED.
+ 
+       2011-02-12  Bruno Haible  <bruno@clisp.org>
+ 
+       setlocale: Prefer gnulib's override over libintl's override.
+       * lib/gettext.h (setlocale): Redefine to rpl_setlocale if
+       GNULIB_defined_setlocale is set.
+ 
+ 2011-02-13  Glenn Morris  <rgm@gnu.org>
+ 
+       * make-dist: Exclude generated file src/globals.h.
+ 
 +2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Import getloadavg module from gnulib.
 +      * .bzrignore: Add lib/stdlib.h.
 +      * Makefile.in (GNULIB_MODULES): Add getloadavg.
 +      * admin/notes/copyright: Remove src/getloadavg.c as a special case.
 +      * configure.in (LIBS_SYSTEM): Omit -lkstat on sol2*; gnulib does this.
 +      (AC_CONFIG_LIBOBJ_DIR, AC_FUNC_GETLOADAVG, GETLOADAVG_FILES):
 +      Remove; gnulib does this now.
 +      * lib/getloadavg.c: Rename from src/getloadavg.c, and sync
 +      from gnulib.  This adds support for several other systems, such
 +      as Tru64 4.0D, QNX, AIX perfstat, etc.  It also fixes a potential
 +      buffer overrun on Linux hosts under very high load, and on hosts
 +      that maintain a channel to the load average file it makes sure
 +      the file descriptor is close-on-exec (on hosts that support this)
 +      and is not stdin, stdout, or stderr.
 +      * lib/stdlib.in.h, m4/getloadavg.m4, m4/stdlib_h.m4: New files,
 +      from gnulib.
 +      * 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.

diff --cc admin/ChangeLog
index ce7ff76aa2c247c6e1bed54d6ceb9cf155ab3a51,5f4dd11ec0f31e54b4aed09f480c50e42c4d0a7c..335fe1df92171ae17dfdeffe39f66b09034eab2a
--- 1/admin/ChangeLog
--- 2/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
- 2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
++2011-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Remove no-longer needed getloadavg symbols.
 +      * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
 +      (LDAV_SYMBOL): Remove.
 +
+ 2011-02-12  Glenn Morris  <rgm@gnu.org>
+ 
+       * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
+ 
  2011-02-05  Glenn Morris  <rgm@gnu.org>
  
        * bzrmerge.el (bzrmerge-warning-buffer): New constant.

diff --cc src/ChangeLog
Simple merge

diff --cc src/lisp.h
Simple merge