Merge from mainline.

diff --cc ChangeLog
index ef876b6e831c05e8e483da479764439f8c34a4fa,13e3657bac3be665be46581ec2147738b68cf8a5..cfd77b652b4910d2c09a407b5be61c5b6e674b93
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,14 +1,18 @@@
 +2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * lib/min-max.h: New file, for "min" and "max".
 +
+ 2011-02-21  Christoph Scholtes  <cschol2112@gmail.com>
+ 
+       * lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
+       $(EMACS_ROOT)/nt/inc/stdint.h.
+ 
+ 2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
+       src/makefile.w32-in and adapt.  Depend on stamp_BLD.
+       (GNULIBOBJS): Add $(BLD)/filemode.$(O).
+ 
  2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
  
        Import filemode module from gnulib.

diff --cc lib-src/ChangeLog
index 81c6e6fe9b4cc39b35e3dd57b13a0cd6d7a006ed,01352adf4e30109a3c05c6a7187178e3c579a567..958539cc04423c4437601cfc60506a2ae832ec49
--- 1/lib-src/ChangeLog
--- 2/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@@ -1,30 -1,9 +1,36 @@@
 +2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      New file "lib/min-max.h".
 +      * ebrowse.c (min, max): Define them by including <min-max.h>
 +      instead of defining it ourselves.
 +      * pop.c (min): Likewise.
 +
 +      * movemail.c (popmail): Report fchown failure instead of ignoring it.
 +      But if the file already has the right ownership, don't worry about it.
 +
 +      * make-docfile.c (input_buffer): Rename variables to avoid shadowing.
 +      * test-distrib.c (buf): Make this local, to avoid shadowing.
 +
 +      * movemail.c (main, pop_retr): Rename locals to avoid shadowing.
 +      (progname, sfi, sfo, ibuffer, obuffer): Remove unused vars.
 +      (DIRECTORY_SEP, IS_DIRECTORY_SEP, DONE, IS_FROM_LINE):
 +      Remove unused macros.
 +      * pop.c (index): Remove unused macro.
 +      (KPOP_PORT): Define only if KERBEROS is defined.
 +
 +      Declare file-scope functions and variables static if not exported.
 +      This is more consistent, and is nicer with gcc -Wstrict-prototypes.
 +      * ebrowse.c, emacsclient.c, fakemail.c, make-docfile.c, movemail.c:
 +      * profile.c, test-distrib.c, update-game-score.c:
 +      Declare non-'main' functions and variables to be static.
 +      * ebrowse.c: Omit redundant function prototypes.
 +
+ 2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
+       ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
+       Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
+ 
  2011-02-21  Ben Key  <bkey76@gmail.com>  (tiny change)
  
        * make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to