Merge from mainline.

diff --cc src/ChangeLog
index 43ca62aedfce40e05cf67fe8adee4fbae8aab668,8ba7b61290e5ae62511a4c740801aa22f837cd50..031b254739e2263812de6c8f01efa8f195157a72
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,29 -1,17 +1,43 @@@
+ 2011-02-12  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * process.c (create_process): Reset SIGPIPE handler in the child.
+       * callproc.c (Fcall_process): Likewise.  (Bug#5238)
+ 
+ 2011-02-12  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xdisp.c <this_line_min_pos>: New variable.
+       (move_it_in_display_line_to): Record in this_line_min_pos the
+       smallest position iterated across.
+       (display_line): Use this_line_min_pos to record the smallest
+       position in the line even if it is not displayed due to
+       hscrolling.  (Bug#7939)
+ 
 +2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Remove no-longer needed getloadavg symbols.
 +      * m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
 +      * s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef.
 +      * s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT):
 +      (LDAV_SYMBOL): Remove.
 +      * s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove.
 +      * s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
 +
 +      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-12  Paul Eggert  <eggert@cs.ucla.edu>
  
        Port to Sun C 5.11, which has __attribute__ ((__aligned (N))).