Merge from mainline.

diff --cc INSTALL
Simple merge

diff --cc README
Simple merge

diff --cc admin/ChangeLog
index e8b2d571ebd9f5d224c17c7316443dcbbfc34cb8,5807863a9105d01110d5e65087fa19bc3fbee0fd..5b714193ab15b3b6abadf2daeb1b6f2dd788d95e
--- 1/admin/ChangeLog
--- 2/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,14 -1,7 +1,18 @@@
 +2011-01-14  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Update copyright notes to match recent gnulib-related changes.
 +      * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
 +      arg-nonnull.h, c++defs.h, compile, depcomp, missing,
 +      warn-on-use.h, lib/*.[ch], lib/gnulib.mk.  Remove src/mktime.c,
 +      lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and
 +      are subsumed by the lib/*.[ch] rule).  Remove m4/getopt.m4 (now
 +      subsumed by m4/*.m4 rule).  config.guess, config.sub, and
 +      doc/man/texinfo.tex are now copied in from gnulib.
 +
+ 2011-01-14  Glenn Morris  <rgm@gnu.org>
+ 
+       * admin.el (set-copyright): Also handle \year in refcards/*.tex.
+ 
  2011-01-14  Glenn Morris  <rgm@gnu.org>
  
        * bzrmerge.el: Require cl when compiling.

diff --cc admin/notes/copyright
Simple merge

diff --cc configure.in
Simple merge

diff --cc lib-src/emacsclient.c
Simple merge

diff --cc lib-src/fakemail.c
Simple merge

diff --cc lib-src/make-docfile.c
Simple merge

diff --cc lib-src/movemail.c
Simple merge

diff --cc lib-src/pop.c
Simple merge

diff --cc lib-src/test-distrib.c
Simple merge

diff --cc lib-src/update-game-score.c
Simple merge

diff --cc make-dist
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/atimer.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/callproc.c
Simple merge

diff --cc src/config.in
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/doc.c
Simple merge

diff --cc src/doprnt.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/filelock.c
Simple merge

diff --cc src/getpagesize.h
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/process.h
Simple merge

diff --cc src/ralloc.c
Simple merge

diff --cc src/regex.c
Simple merge

diff --cc src/sysdep.c
Simple merge

diff --cc src/systty.h
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xrdb.c
Simple merge

diff --cc src/xselect.c
Simple merge

diff --cc src/xsmfns.c
Simple merge

diff --cc src/xterm.c
Simple merge