Merge from emacs-23

[gnu-emacs] / lisp / emacs-lisp / generic.el

diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 51b23c3f402619aab3cc9656e9cb6841e58881b2..8178cef7a4040382ce89d39d2d195c855654a68a 100644 (file)
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -1,7 +1,7 @@
 ;;; generic.el --- defining simple major modes with comment and font-lock
 ;;
 ;; Copyright (C) 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:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Fri Sep 27 1996