Merge from emacs-23 branch, up to 2010-05-20T22:16:19Z!juri@jurta.org.

[gnu-emacs] / src / s / template.h

diff --git a/src/s/template.h b/src/s/template.h
index eb7ca85c5e59afb6fe7d8b000edaee287ab6e7f9..f08da48dfc0b82778719397d77f8a3afcd6c8ccd 100644 (file)
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -3,7 +3,7 @@
    should define or not.
 
 Copyright (C) 1985, 1986, 1992, 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.
 
@@ -121,5 +121,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
 
-/* arch-tag: 4b426b11-cb2e-4c0e-a488-e663f76a0515
-   (do not change this comment) */