Merge from mainline.

diff --cc ChangeLog
index 649fe4b2ba6c9bb46b7bca7272d32125ac17f02c,2a0dd144670bd59df1da3a351f9ce6b2539e79d7..851653384608fef9e4542b0c812e86d8c0e413c2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,24 -1,28 +1,49 @@@
- 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.
 +      * 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.
+       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

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc lib/Makefile.in
Simple merge

diff --cc src/ChangeLog
index 72d6c49592a743d8e2cbe74686788c38c1ff6c51,68a12d4f55acf6e8ec139c5111351b4cd321ac73..ccb54ffffa7dc12f48f8e83988f3d8946df4e398
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,44 +1,54 @@@
- 2011-02-08  Paul Eggert  <eggert@cs.ucla.edu>
++2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Import getloadavg module from gnulib.
 +      * deps.mk (getloadavg.o): Remove; gnulib now does this.
 +      * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
 +      now does this.
 +      * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
 +      * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
 +      * config.in: Regenerate.
 +
+ 2011-02-10  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.
+ 
+ 2011-02-09  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj):
+       New macros.
+       (globals.h, gl-stamp): New targets.
+       (clean): Clean gl-stamp and globals.h.
+ 
+ 2011-02-09  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * Makefile.in (gl-stamp): Create globals.h here.
+       (globals.h): Don't do it here.
+       (mostlyclean): Clean globals.h and gl-stamp.
+ 
+ 2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * Makefile.in ($(otherobj)): Depend on globals.h.
+       Otherwise 'make -j10' failed on my host, because the build lacked
+       necessary dependencies, e.g., vm-limit.o depends on globals.h.
+ 
+ 2011-02-08  Tom Tromey  <tromey@redhat.com>
+ 
+       * Makefile.in (NS_OBJC_OBJ): New variable.
+       (base_obj): Rename from 'obj'.
+       (obj): New variable.
+       (globals.h, gl-stamp, $(obj)): New targets.
+       (GLOBAL_SOURCES): New variable.
+       * globals.h: Remove.
+       * nsselect.m (Vselection_alist): Define.  Reverts part of
+       2011-01-19T22:11:33Z!jan.h.d@swipnet.se.
+       * buffer.c: Don't use "no_cell" for name of kill-buffer-hook's
+       variable.
+       * xselect.c (Vselection_alist): Define.  Reverts part of 2011-01-19T23:32:42Z!eggert@cs.ucla.edu.
+ 
+ 2011-02-08  Kenichi Handa  <handa@m17n.org>
+ 
+       * font.c (Ffont_get): Do not cache :otf value.
+ 
  2011-02-07  Paul Eggert  <eggert@cs.ucla.edu>
  
        conform to C89 pointer rules