Merge from mainline.

diff --cc ChangeLog
index 10ee8f70394e617c338e46e6c70f32de74c5f586,07cafd1f33acd25cbd65d3ea25ced7447d9e6bb8..1155a1b6e8cc52b5d95812dd95a3feaf652fc9a4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,8 +1,23 @@@
+ 2011-02-20  Christoph Scholtes <cschol2112@gmail.com>
+ 
+       * lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
+       src/makefile.w32-in.
+ 
 +2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Import filemode module from gnulib.
 +      * .bzrignore: Add lib/sys/.
 +      * Makefile.in (GNULIB_MODULES): Add filemode.
 +      * lib/Makefile.am (MOSTLYCLEANDIRS): New macro.
 +      * lib/filemode.c: Renamed from src/filemode.c and regenerated
 +      from gnulib.  This adds support for some more file types, e.g.,
 +      Cray DMF migrated files.
 +      * lisp/emacs-lisp/find-gc.el (find-gc-source-files): Remove filemode.c.
 +      * lib/filemode.h, lib/sys_stat.in.h, m4/filemode.m4, m4/st_dm_mode.m4:
 +      * m4/sys_stat_h.m4: New files, generated from gnulib.
 +      * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
 +      Regenerate.
 +
  2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
  
        Import crypto/md5 and stdint modules from gnulib.

diff --cc src/ChangeLog
index 880fb10e85a9e160ff838442d1cba4f75495a7a1,c53e5add3fbd14a3d239174c911ca3d4277c0ea4..8bf59d124655e6dab871da81c2978c59bdfa1669
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,14 +1,24 @@@
+ 2011-02-20  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * makefile.w32-in ($(BLD)/fns.$(O)): Depend on
+       $(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
+ 
+ 2011-02-20  Christoph Scholtes <cschol2112@gmail.com>
+ 
+       * makefile.w32-in: Remove md5.$(O).
+       ($(BLD)/md5.$(O)): Remove prerequisites, moved to
+       lib/makefile.w32-in.
+ 
 +2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Import filemode module from gnulib.
 +      * Makefile.in (base_obj): Remove filemode.o, as it's now in ../lib.
 +      * deps.mk (dired.o): Depend on ../lib/filemode.h, too.
 +      (filemode.o): Remove; this is now in ../lib.
 +      * dired.c: Include <filemode.h>.
 +      (filemodestring): Remove now-redundant decl.
 +      * config.in: Regenerate.
 +
  2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
  
        Import crypto/md5 and stdint modules from gnulib.