Merge from mainline.

16 files changed, 16 insertions, 16 deletions

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 6e52b4dfeab..fdcd2c028e3 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
    Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index b7ebe88cc5d..bf828b4660c 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -1,6 +1,6 @@
 /* sendmail-like interface to /bin/mail for system V,
    Copyright (C) 1985, 1994, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 Author: Bill Rozas <jinx@martigny.ai.mit.edu>
 (according to ack.texi)
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index b63ae90eafb..e3e73768435 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-#               2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#               2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index b31ab812534..ce83428fb43 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,6 +1,6 @@
 /* Convert files for Emacs Hexl mode.
    Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 2009, 2010  Free Software Foundation, Inc.
+                 2009, 2010, 2011  Free Software Foundation, Inc.
 
 Author: Keith Gabryelski
 (according to authors.el)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 43648c8abc7..3a3cc490afe 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,6 @@
 /* Generate doc-string file for GNU Emacs from source files.
    Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
                  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 5591f0edbed..3ef08982ec0 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-#   2009, 2010 Free Software Foundation, Inc.
+#   2009, 2010, 2011 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 8c6a0ddcb64..16584a89bd3 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
    Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index c24b35d9a19..811080eb9db 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
    Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 4dd6a32ee32..f2e5a12daf3 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
    Copyright (C) 1994, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010 Free Software Foundation, Inc.
+                 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 78793f1e9c7..4ac55192fd6 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
    Copyright (C) 1991, 1993, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 Author: Jonathan Kamens <jik@security.ov.com>
 
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 2ba3fab83a0..6915dc8d729 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,6 +1,6 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
    Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 Author:  Jonathan Kamens <jik@security.ov.com>
 
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 37653e63c49..e8832a3d776 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,6 +1,6 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
    Copyright (C) 1992, 1994, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index f82e03bdcf1..be3fa1e5b8c 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -3,7 +3,7 @@
 # This script accepts any number of file arguments and checks them into RCS.
 
 # Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006,
-#   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#   2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index bdb5b160491..a58d5ee1fe6 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -1,7 +1,7 @@
 /* test-distrib.c --- testing distribution of nonprinting chars
 
 Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003, 2004, 2005,
-              2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+              2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index ee4b9a3ba99..6156de672bd 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,6 +1,6 @@
 /* update-game-score.c --- Update a score file
 
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
   Free Software Foundation, Inc.
 
 Author: Colin Walters <walters@debian.org>
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 1d08e5d194f..4bf751b0450 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -4,7 +4,7 @@
 # This version is more compatible with rcsdiff(1).
 
 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+#   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 # Author: Paul Eggert
 # (according to authors.el)