Merge from emacs-23

[gnu-emacs] / lisp / progmodes / cc-bytecomp.el

diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 597267d4e5db2c79e90cd327a1bcb9817b56e4f9..1e6d9606dfd09f57cb619f49a0f4b4b17793f396 100644 (file)
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -1,6 +1,6 @@
 ;;; cc-bytecomp.el --- compile time setup for proper compilation
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 
 ;; Author:     Martin Stjernholm
@@ -434,5 +434,4 @@ exclude any functions that have been bound during compilation with
 \f
 (provide 'cc-bytecomp)
 
-;; arch-tag: 2d71b3ad-57b0-4b13-abd3-ab836e08f975
 ;;; cc-bytecomp.el ends here