Merge from mainline.

diff --cc src/ChangeLog
index 635a2d72f9c5aa821a8ec8ae995d886507153954,4ef9778ca488a60e813d4e9a7ecf48249d18fcf0..617bd23ab786b37324f5f425a2142dea542439b1
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,29 -1,16 +1,42 @@@
- 2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
++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 Solaris 10, which doesn't support FC_HINT_STYLE.
+       * xftfont.c (FC_HINT_STYLE): #define to "hintstyle" if not
+       defined.
+       * xsettings.c (parse_settings, apply_xft_settings): Don't assume
+       FC_HINT_STYLE is supported.
+ 
+ 2011-02-11  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * xterm.c (x_set_frame_alpha): Access data before it is free:d.
+       Make sure we don't do x_catch_errors twice.
+ 
  2011-02-10  Glenn Morris  <rgm@gnu.org>
  
        * Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.