From 219c26ea51779faadeef63622e272601c6dd804e Mon Sep 17 00:00:00 2001
From: "Joel E. Denny" <jdenny@clemson.edu>
Date: Mon, 4 Jan 2010 13:59:11 -0500
Subject: [PATCH] maint: run "make update-copyright"

---
 ChangeLog                     |   9 +-
 HACKING                       |   3 +-
 Makefile.am                   |   3 +-
 NEWS                          |   3 +-
 PACKAGING                     |   2 +-
 README                        |   4 +-
 README-alpha                  |   2 +-
 TODO                          |   3 +-
 bootstrap                     |   3 +-
 bootstrap.conf                |   2 +-
 build-aux/update-b4-copyright |   2 +-
 cfg.mk                        |   2 +-
 configure.ac                  |   3 +-
 data/Makefile.am              |   3 +-
 data/README                   |   2 +-
 data/bison.m4                 |   3 +-
 data/c++-skel.m4              |   2 +-
 data/c++.m4                   |   3 +-
 data/c-skel.m4                |   2 +-
 data/c.m4                     |   3 +-
 data/glr.c                    |   7 +-
 data/glr.cc                   |   5 +-
 data/java-skel.m4             |   2 +-
 data/java.m4                  |   2 +-
 data/lalr1.cc                 |   9 +-
 data/lalr1.java               |   4 +-
 data/location.cc              |   7 +-
 data/xslt/bison.xsl           |   2 +-
 data/xslt/xml2dot.xsl         |   2 +-
 data/xslt/xml2text.xsl        |   2 +-
 data/xslt/xml2xhtml.xsl       |   2 +-
 data/yacc.c                   |  10 +-
 djgpp/Makefile.maint          |   3 +-
 djgpp/README.in               |   2 +-
 djgpp/config.bat              |   3 +-
 djgpp/config.sed              |   3 +-
 djgpp/config.site             |   3 +-
 djgpp/config_h.sed            |   3 +-
 djgpp/djunpack.bat            |   3 +-
 djgpp/subpipe.c               |   3 +-
 djgpp/subpipe.h               |   3 +-
 djgpp/testsuite.sed           |   2 +-
 doc/Makefile.am               |   3 +-
 doc/bison.texinfo             |   5 +-
 doc/refcard.tex               |   2 +-
 etc/Makefile.am               |   2 +-
 etc/README                    |   2 +-
 etc/bench.pl.in               |   2 +-
 examples/Makefile.am          |   2 +-
 examples/calc++/Makefile.am   |   2 +-
 examples/extexi               |   2 +-
 lib/Makefile.am               |   4 +-
 lib/abitset.c                 |   3 +-
 lib/abitset.h                 |   2 +-
 lib/bbitset.h                 |   2 +-
 lib/bitset.c                  |   3 +-
 lib/bitset.h                  |   2 +-
 lib/bitset_stats.c            |   3 +-
 lib/bitset_stats.h            |   2 +-
 lib/bitsetv-print.c           |   4 +-
 lib/bitsetv-print.h           |   2 +-
 lib/bitsetv.c                 |   2 +-
 lib/bitsetv.h                 |   2 +-
 lib/ebitset.c                 |   3 +-
 lib/ebitset.h                 |   2 +-
 lib/get-errno.c               |   2 +-
 lib/get-errno.h               |   2 +-
 lib/lbitset.c                 |   2 +-
 lib/lbitset.h                 |   2 +-
 lib/libiberty.h               |   2 +-
 lib/main.c                    |   2 +-
 lib/subpipe.c                 |   2 +-
 lib/subpipe.h                 |   3 +-
 lib/timevar.c                 |   2 +-
 lib/timevar.def               |   2 +-
 lib/timevar.h                 |   3 +-
 lib/vbitset.c                 |   3 +-
 lib/vbitset.h                 |   2 +-
 lib/yyerror.c                 |   2 +-
 m4/bison-i18n.m4              |   2 +-
 m4/c-working.m4               |   2 +-
 m4/cxx.m4                     |   2 +-
 m4/m4.m4                      |   3 +-
 m4/subpipe.m4                 |   3 +-
 m4/timevar.m4                 |   2 +-
 src/LR0.c                     |   4 +-
 src/LR0.h                     |   2 +-
 src/Makefile.am               |   3 +-
 src/assoc.c                   |   3 +-
 src/assoc.h                   |   2 +-
 src/closure.c                 |   4 +-
 src/closure.h                 |   2 +-
 src/complain.c                |   2 +-
 src/complain.h                |   2 +-
 src/conflicts.c               |   4 +-
 src/conflicts.h               |   2 +-
 src/derives.c                 |   4 +-
 src/derives.h                 |   2 +-
 src/files.c                   |   4 +-
 src/files.h                   |   2 +-
 src/flex-scanner.h            |   2 +-
 src/getargs.c                 |   4 +-
 src/getargs.h                 |   4 +-
 src/gram.c                    |   4 +-
 src/gram.h                    |   4 +-
 src/graphviz.c                |   2 +-
 src/lalr.c                    |   4 +-
 src/lalr.h                    |   4 +-
 src/location.c                |   3 +-
 src/location.h                |   3 +-
 src/main.c                    |   4 +-
 src/muscle_tab.c              |   3 +-
 src/muscle_tab.h              |   2 +-
 src/nullable.c                |   4 +-
 src/nullable.h                |   2 +-
 src/output.c                  |   4 +-
 src/output.h                  |   2 +-
 src/parse-gram.c              | 531 +++++++++++++++++-----------------
 src/parse-gram.h              |  12 +-
 src/parse-gram.y              |   3 +-
 src/print-xml.c               |   2 +-
 src/print-xml.h               |   2 +-
 src/print.c                   |   4 +-
 src/print.h                   |   2 +-
 src/print_graph.c             |   3 +-
 src/print_graph.h             |   2 +-
 src/reader.c                  |   4 +-
 src/reader.h                  |   4 +-
 src/reduce.c                  |   4 +-
 src/reduce.h                  |   2 +-
 src/relation.c                |   3 +-
 src/relation.h                |   2 +-
 src/scan-code.h               |   2 +-
 src/scan-code.l               |   2 +-
 src/scan-gram.h               |   2 +-
 src/scan-gram.l               |   3 +-
 src/scan-skel.h               |   2 +-
 src/scan-skel.l               |   3 +-
 src/state.c                   |   3 +-
 src/state.h                   |   4 +-
 src/symlist.c                 |   2 +-
 src/symlist.h                 |   2 +-
 src/symtab.c                  |   4 +-
 src/symtab.h                  |   4 +-
 src/system.h                  |   3 +-
 src/tables.c                  |   4 +-
 src/tables.h                  |   2 +-
 src/uniqstr.c                 |   2 +-
 src/uniqstr.h                 |   2 +-
 tests/Makefile.am             |   3 +-
 tests/actions.at              |   3 +-
 tests/atlocal.in              |   3 +-
 tests/c++.at                  |   3 +-
 tests/calc.at                 |   3 +-
 tests/conflicts.at            |   4 +-
 tests/cxx-type.at             |   3 +-
 tests/existing.at             |   4 +-
 tests/glr-regression.at       |   2 +-
 tests/headers.at              |   4 +-
 tests/input.at                |   3 +-
 tests/java.at                 |   2 +-
 tests/local.at                |   3 +-
 tests/output.at               |   3 +-
 tests/push.at                 |   2 +-
 tests/reduce.at               |   3 +-
 tests/regression.at           |   3 +-
 tests/sets.at                 |   4 +-
 tests/skeletons.at            |   2 +-
 tests/synclines.at            |   4 +-
 tests/testsuite.at            |   4 +-
 tests/torture.at              |   2 +-
 171 files changed, 496 insertions(+), 538 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index baaf044f..2ba38b9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-04  Joel E. Denny  <jdenny@clemson.edu>
+
+	maint: run "make update-copyright"
+
 2009-12-30  Joel E. Denny  <jdenny@clemson.edu>
 
 	POSIX: warn if %prec's token was not defined.
@@ -21585,9 +21589,8 @@
 
 	-----
 
-	Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996,
-	1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-	2007, 2008, 2009 Free Software Foundation, Inc.
+	Copyright (C) 1987-1988, 1991-2010 Free Software Foundation,
+	Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice and this
diff --git a/HACKING b/HACKING
index 32fa8d90..8b573866 100644
--- a/HACKING
+++ b/HACKING
@@ -360,8 +360,7 @@ Push these changes.
 
 -----
 
-Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009
-Free Software Foundation, Inc.
+Copyright (C) 2002-2005, 2007-2010 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/Makefile.am b/Makefile.am
index 036efac7..8a705de6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/NEWS b/NEWS
index 9045431f..7cb3d4e2 100644
--- a/NEWS
+++ b/NEWS
@@ -1134,8 +1134,7 @@ End:
 
 -----
 
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1995-2010 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Parser Generator.
 
diff --git a/PACKAGING b/PACKAGING
index 6f858727..12cd2953 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -36,7 +36,7 @@ to the bison package.
 
 -----
 
-Copyright (C) 2002, 2005, 2009 Free Software Foundation, Inc.
+Copyright (C) 2002, 2005, 2009-2010 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/README b/README
index 2bf62bf2..11466572 100644
--- a/README
+++ b/README
@@ -40,8 +40,8 @@ End:
 
 -----
 
-Copyright (C) 1992, 1998, 1999, 2003, 2004, 2005, 2008-2009 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2010 Free Software
+Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/README-alpha b/README-alpha
index 14ca052c..70122b99 100644
--- a/README-alpha
+++ b/README-alpha
@@ -12,7 +12,7 @@ the problems you encounter.
 
 -----
 
-Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/TODO b/TODO
index 6686ca4e..7508f03d 100644
--- a/TODO
+++ b/TODO
@@ -290,8 +290,7 @@ Equip the parser with a means to create the (visual) parse tree.
 
 -----
 
-Copyright (C) 2001, 2002, 2003, 2004, 2006, 2009 Free Software
-Foundation, Inc.
+Copyright (C) 2001-2004, 2006, 2009-2010 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/bootstrap b/bootstrap
index 4d31cbe4..5717b46c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,8 +2,7 @@
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/bootstrap.conf b/bootstrap.conf
index dff8d80a..0c421074 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/update-b4-copyright b/build-aux/update-b4-copyright
index 30c38013..689daad6 100755
--- a/build-aux/update-b4-copyright
+++ b/build-aux/update-b4-copyright
@@ -3,7 +3,7 @@
 # Update b4_copyright invocations or b4_copyright_years definitions to
 # include the current year.
 
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/cfg.mk b/cfg.mk
index 5c74313f..e8cdfbf3 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/configure.ac b/configure.ac
index 4f30fa78..72fa8372 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/Makefile.am b/data/Makefile.am
index 8ac50879..48ddc6d9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,4 @@
-## Copyright (C) 2002, 2005, 2006, 2007, 2008-2009 Free Software
-## Foundation, Inc.
+## Copyright (C) 2002, 2005-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/README b/data/README
index 1de6c78c..1698e252 100644
--- a/data/README
+++ b/data/README
@@ -52,7 +52,7 @@ into various formats.
 
 -----
 
-Copyright (C) 2002, 2008-2009 Free Software Foundation, Inc.
+Copyright (C) 2002, 2008-2010 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/data/bison.m4 b/data/bison.m4
index f9dd503d..ab748536 100644
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -1,8 +1,7 @@
                                                             -*- Autoconf -*-
 
 # Language-independent M4 Macros for Bison.
-# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/c++-skel.m4 b/data/c++-skel.m4
index b98f7bb7..f017abc2 100644
--- a/data/c++-skel.m4
+++ b/data/c++-skel.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C++ skeleton dispatching for Bison.
-# Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/c++.m4 b/data/c++.m4
index 463deb7b..efad440a 100644
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -2,8 +2,7 @@
 
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/c-skel.m4 b/data/c-skel.m4
index 20c2a831..a491b607 100644
--- a/data/c-skel.m4
+++ b/data/c-skel.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C skeleton dispatching for Bison.
-# Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/c.m4 b/data/c.m4
index 518f8c0d..48551824 100644
--- a/data/c.m4
+++ b/data/c.m4
@@ -1,8 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C M4 Macros for Bison.
-# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008-2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/glr.c b/data/glr.c
index 2a130a6b..0c795a63 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -1,8 +1,7 @@
                                                                     -*- C -*-
 
 # GLR skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -150,7 +149,7 @@ m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison GLR parsers in C],
-             [2002, 2003, 2004, 2005, 2006, 2009])
+             [2002-2006, 2009-2010])
 [
 /* C GLR parser skeleton written by Paul Hilfinger.  */
 
@@ -2640,7 +2639,7 @@ m4_if(b4_skeleton, ["glr.c"],
 [b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C],
-             [2002, 2003, 2004, 2005, 2006, 2009])
+             [2002-2006, 2009-2010])
 
 b4_shared_declarations
 
diff --git a/data/glr.cc b/data/glr.cc
index ff19e279..57b4f1f9 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,8 +1,7 @@
                                                                     -*- C -*-
 
 # C++ GLR skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -219,7 +218,7 @@ m4_popdef([b4_parse_param])
 m4_divert_push(0)
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2009])[
+             [2002-2006, 2009-2010])[
 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
diff --git a/data/java-skel.m4 b/data/java-skel.m4
index 7c314ceb..b5e66e44 100644
--- a/data/java-skel.m4
+++ b/data/java-skel.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # Java skeleton dispatching for Bison.
-# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/java.m4 b/data/java.m4
index c03b65d7..91a1ed73 100644
--- a/data/java.m4
+++ b/data/java.m4
@@ -2,7 +2,7 @@
 
 # Java language support for Bison
 
-# Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/lalr1.cc b/data/lalr1.cc
index 7db05fee..6c66dd1b 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,7 +34,7 @@ m4_divert_push(0)dnl
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008-2009])
+             [2002-2010])
 dnl FIXME: This is wrong, we want computed header guards.
 [
 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
@@ -300,7 +299,7 @@ b4_percent_code_get([[provides]])[]dnl
 ])dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008-2009])
+             [2002-2010])
 b4_percent_code_get([[top]])[]dnl
 m4_if(b4_prefix, [yy], [],
 [
@@ -1057,7 +1056,7 @@ b4_error_verbose_if([, int tok])[)
 dnl
 @output(b4_dir_prefix[]stack.hh@)@
 b4_copyright([Stack handling for Bison parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008-2009])[
+             [2002-2010])[
 
 #ifndef BISON_STACK_HH
 # define BISON_STACK_HH
diff --git a/data/lalr1.java b/data/lalr1.java
index a7c5655f..8b5a3907 100644
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -1,6 +1,6 @@
 # Java skeleton for Bison -*- autoconf -*-
 
-# Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ m4_ifval(m4_defn([b4_symbol_destructors]),
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],
-             [2007, 2008-2009])
+             [2007-2010])
 
 b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
 ])[/* First part of user declarations.  */
diff --git a/data/location.cc b/data/location.cc
index d21e362a..50a9065b 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2002-2007, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +20,7 @@ m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_dir_prefix[]position.hh@)@
 b4_copyright([Positions for Bison parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2009])[
+             [2002-2007, 2009-2010])[
 
 /**
  ** \file position.hh
@@ -146,7 +145,7 @@ b4_copyright([Positions for Bison parsers in C++],
 #endif // not BISON_POSITION_HH]
 @output(b4_dir_prefix[]location.hh@)@
 b4_copyright([Locations for Bison parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2009])[
+             [2002-2007, 2009-2010])[
 
 /**
  ** \file location.hh
diff --git a/data/xslt/bison.xsl b/data/xslt/bison.xsl
index f5f6323b..b5d163d3 100644
--- a/data/xslt/bison.xsl
+++ b/data/xslt/bison.xsl
@@ -3,7 +3,7 @@
 <!--
     bison.xsl - common templates for Bison XSLT.
 
-    Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+    Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2dot.xsl b/data/xslt/xml2dot.xsl
index 2b897e0c..b1a07804 100644
--- a/data/xslt/xml2dot.xsl
+++ b/data/xslt/xml2dot.xsl
@@ -3,7 +3,7 @@
 <!--
     xml2dot.xsl - transform Bison XML Report into DOT.
 
-    Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+    Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index fbb6f2bd..866efe3b 100644
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -3,7 +3,7 @@
 <!--
     xml2text.xsl - transform Bison XML Report into plain text.
 
-    Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+    Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index f366503e..4176ec42 100644
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -3,7 +3,7 @@
 <!--
     xml2html.xsl - transform Bison XML Report into XHTML.
 
-    Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+    Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/yacc.c b/data/yacc.c
index 2f75028a..67e18404 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -2,8 +2,8 @@
 
 # Yacc compatible skeleton for Bison
 
-# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 1984, 1989-1990, 2000-2010 Free Software Foundation,
+# Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -155,8 +155,7 @@ m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],
-             [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005,
-              2006, 2009])[
+             [1984, 1989-1990, 2000-2006, 2009-2010])[
 
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
@@ -1686,8 +1685,7 @@ yypushreturn:
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],
-             [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005,
-              2006, 2009])
+             [1984, 1989-1990, 2000-2006, 2009-2010])
 
 b4_percent_code_get([[requires]])[]dnl
 
diff --git a/djgpp/Makefile.maint b/djgpp/Makefile.maint
index 9a67b926..94cfbf21 100644
--- a/djgpp/Makefile.maint
+++ b/djgpp/Makefile.maint
@@ -1,8 +1,7 @@
 # DJGPP Maintainer's Makefile                                    -*-Makefile-*-
 # Requires GNU sed
 
-## Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-## Inc.
+## Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/djgpp/README.in b/djgpp/README.in
index 05081617..a02e9bf4 100644
--- a/djgpp/README.in
+++ b/djgpp/README.in
@@ -1,6 +1,6 @@
 This is a port of GNU Bison @VERSION@ to MSDOS/DJGPP.
 
-Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/djgpp/config.bat b/djgpp/config.bat
index b3d75d8e..a71543ce 100644
--- a/djgpp/config.bat
+++ b/djgpp/config.bat
@@ -4,8 +4,7 @@ Rem Configure Bison for DJGPP.
 Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line
 Rem format, or else stock DOS/Windows shells will refuse to run it.
 
-Rem Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-Rem Inc.
+Rem Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
 Rem This program is free software: you can redistribute it and/or modify
 Rem it under the terms of the GNU General Public License as published by
diff --git a/djgpp/config.sed b/djgpp/config.sed
index d906db8f..3c00de58 100644
--- a/djgpp/config.sed
+++ b/djgpp/config.sed
@@ -3,8 +3,7 @@
 # of the configure script generated by autoconf 2.62.
 
 
-# Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/djgpp/config.site b/djgpp/config.site
index 2fee3746..ae10686d 100644
--- a/djgpp/config.site
+++ b/djgpp/config.site
@@ -3,8 +3,7 @@
 # This is the config.site file for configuring GNU packages
 # which are to be built with DJGPP tools.
 
-# Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/djgpp/config_h.sed b/djgpp/config_h.sed
index 14a74f58..e24b4e70 100644
--- a/djgpp/config_h.sed
+++ b/djgpp/config_h.sed
@@ -1,7 +1,6 @@
 # sed script for DJGPP specific editing of config.hin
 
-# Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/djgpp/djunpack.bat b/djgpp/djunpack.bat
index aa96efd8..cca988fc 100644
--- a/djgpp/djunpack.bat
+++ b/djgpp/djunpack.bat
@@ -7,8 +7,7 @@ Rem This batch file unpacks the Bison distribution while simultaneously
 Rem renaming some of the files whose names are invalid on DOS or conflict
 Rem with other file names after truncation to DOS 8+3 namespace.
 Rem
-Rem Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-Rem Inc.
+Rem Copyright (C) 2005-2010 Free Software Foundation, Inc.
 Rem
 Rem This program is free software: you can redistribute it and/or modify
 Rem it under the terms of the GNU General Public License as published by
diff --git a/djgpp/subpipe.c b/djgpp/subpipe.c
index bbff5904..213703d4 100644
--- a/djgpp/subpipe.c
+++ b/djgpp/subpipe.c
@@ -1,7 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-   Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/djgpp/subpipe.h b/djgpp/subpipe.h
index 4257f418..aaf49bf7 100644
--- a/djgpp/subpipe.h
+++ b/djgpp/subpipe.h
@@ -1,6 +1,5 @@
 /* Subprocesses with pipes.
-   Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-   Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/djgpp/testsuite.sed b/djgpp/testsuite.sed
index d5a0d7b7..620c4718 100644
--- a/djgpp/testsuite.sed
+++ b/djgpp/testsuite.sed
@@ -3,7 +3,7 @@
 # of the testsuite script generated by autoconf 2.61.
 
 
-# Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7ea9f142..4a5a6eb8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008-2009 Free
-## Software Foundation, Inc.
+## Copyright (C) 2001-2003, 2005-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index f3aaa28e..6583dbdd 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -33,9 +33,8 @@
 This manual (@value{UPDATED}) is for @acronym{GNU} Bison (version
 @value{VERSION}), the @acronym{GNU} parser generator.
 
-Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
-Software Foundation, Inc.
+Copyright @copyright{} 1988-1993, 1995, 1998-2010 Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/refcard.tex b/doc/refcard.tex
index 59e9dea2..55acb28e 100644
--- a/doc/refcard.tex
+++ b/doc/refcard.tex
@@ -19,7 +19,7 @@
 \def\finalout{\overfullrule=0pt}
 %\finalout
 
-% Copyright (c) 1998, 2001, 2009 Free Software Foundation, Inc.
+% Copyright (c) 1998, 2001, 2009-2010 Free Software Foundation, Inc.
 %
 % This file is part of Bison.
 %
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 6b5e36ed..3f789b96 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/etc/README b/etc/README
index 01fa0518..0ae5b8d4 100644
--- a/etc/README
+++ b/etc/README
@@ -19,7 +19,7 @@ straightforward use of _build/src/bison would.)
 
 --
 
-Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index a6a2f1a7..8579ca59 100755
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 2006, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.
 #
 # This file is part of Bison, the GNU Compiler Compiler.
 #
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ba1d2161..552adf4b 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/calc++/Makefile.am b/examples/calc++/Makefile.am
index 085ffaa8..df8204e2 100644
--- a/examples/calc++/Makefile.am
+++ b/examples/calc++/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/extexi b/examples/extexi
index 15fb2787..373aea22 100644
--- a/examples/extexi
+++ b/examples/extexi
@@ -1,7 +1,7 @@
 # Extract all examples from the manual source.            -*- AWK -*-
 
 # This file is part of GNU Bison
-# Copyright (C) 1992, 2000, 2001, 2005, 2006, 2009 Free Software
+# Copyright (C) 1992, 2000-2001, 2005-2006, 2009-2010 Free Software
 # Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f7c3bef5..77ca6646 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 # Make bison/lib.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2004, 2006, 2008-2010 Free Software Foundation,
+# Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/abitset.c b/lib/abitset.c
index 551848c9..dc71713d 100644
--- a/lib/abitset.c
+++ b/lib/abitset.c
@@ -1,5 +1,6 @@
 /* Array bitsets.
-   Copyright (C) 2002, 2003, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2009-2010 Free Software Foundation,
+   Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/abitset.h b/lib/abitset.h
index c4a0e535..86e20e1e 100644
--- a/lib/abitset.h
+++ b/lib/abitset.h
@@ -1,5 +1,5 @@
 /* Functions to support abitsets.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bbitset.h b/lib/bbitset.h
index d9d5e4b5..c24d1163 100644
--- a/lib/bbitset.h
+++ b/lib/bbitset.h
@@ -1,5 +1,5 @@
 /* Base bitset stuff.
-   Copyright (C) 2002, 2003, 2004, 2006, 2009 Free Software Foundation,
+   Copyright (C) 2002-2004, 2006, 2009-2010 Free Software Foundation,
    Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/bitset.c b/lib/bitset.c
index 3b76618e..83d10a86 100644
--- a/lib/bitset.c
+++ b/lib/bitset.c
@@ -1,6 +1,5 @@
 /* General bitsets.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitset.h b/lib/bitset.h
index 07e1d9d6..8e319380 100644
--- a/lib/bitset.h
+++ b/lib/bitset.h
@@ -1,5 +1,5 @@
 /* Generic bitsets.
-   Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitset_stats.c b/lib/bitset_stats.c
index d71b91a0..a0563853 100644
--- a/lib/bitset_stats.c
+++ b/lib/bitset_stats.c
@@ -1,6 +1,5 @@
 /* Bitset statistics.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitset_stats.h b/lib/bitset_stats.h
index fb203c48..06dac77d 100644
--- a/lib/bitset_stats.h
+++ b/lib/bitset_stats.h
@@ -1,5 +1,5 @@
 /* Functions to support bitset statistics.
-   Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitsetv-print.c b/lib/bitsetv-print.c
index 3cc73bd8..3ab545e7 100644
--- a/lib/bitsetv-print.c
+++ b/lib/bitsetv-print.c
@@ -1,6 +1,6 @@
 /* Bitset vectors.
-   Copyright (C) 2001, 2002, 2004, 2006, 2009 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2002, 2004, 2006, 2009-2010 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/bitsetv-print.h b/lib/bitsetv-print.h
index be55a68f..b4913184 100644
--- a/lib/bitsetv-print.h
+++ b/lib/bitsetv-print.h
@@ -1,5 +1,5 @@
 /* Bitset vectors.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Akim Demaille (akim@freefriends.org).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitsetv.c b/lib/bitsetv.c
index 36b22742..3a082794 100644
--- a/lib/bitsetv.c
+++ b/lib/bitsetv.c
@@ -1,5 +1,5 @@
 /* Bitset vectors.
-   Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009 Free Software
+   Copyright (C) 2001-2002, 2004-2006, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitsetv.h b/lib/bitsetv.h
index 5ad8b6b7..2bec847c 100644
--- a/lib/bitsetv.h
+++ b/lib/bitsetv.h
@@ -1,5 +1,5 @@
 /* Bitset vectors.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/ebitset.c b/lib/ebitset.c
index e3839424..0d12d044 100644
--- a/lib/ebitset.c
+++ b/lib/ebitset.c
@@ -1,6 +1,5 @@
 /* Functions to support expandable bitsets.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/ebitset.h b/lib/ebitset.h
index d344513d..3d73acee 100644
--- a/lib/ebitset.h
+++ b/lib/ebitset.h
@@ -1,5 +1,5 @@
 /* Functions to support ebitsets.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/get-errno.c b/lib/get-errno.c
index 6d2dae79..f0a82e2c 100644
--- a/lib/get-errno.c
+++ b/lib/get-errno.c
@@ -1,6 +1,6 @@
 /* get-errno.c - get and set errno.
 
-   Copyright (C) 2002, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/get-errno.h b/lib/get-errno.h
index 0f49a52a..5cb660bd 100644
--- a/lib/get-errno.h
+++ b/lib/get-errno.h
@@ -1,6 +1,6 @@
 /* get-errno.h - get and set errno.
 
-   Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/lbitset.c b/lib/lbitset.c
index 81e934e6..d48a4a83 100644
--- a/lib/lbitset.c
+++ b/lib/lbitset.c
@@ -1,5 +1,5 @@
 /* Functions to support link list bitsets.
-   Copyright (C) 2002, 2003, 2004, 2006, 2009 Free Software Foundation,
+   Copyright (C) 2002-2004, 2006, 2009-2010 Free Software Foundation,
    Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/lbitset.h b/lib/lbitset.h
index c67b4412..59f79144 100644
--- a/lib/lbitset.h
+++ b/lib/lbitset.h
@@ -1,5 +1,5 @@
 /* Functions to support lbitsets.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/libiberty.h b/lib/libiberty.h
index c71da38b..ac5842e7 100644
--- a/lib/libiberty.h
+++ b/lib/libiberty.h
@@ -1,5 +1,5 @@
 /* Fake libiberty.h for Bison.
-   Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/main.c b/lib/main.c
index 13cd9f46..028194a0 100644
--- a/lib/main.c
+++ b/lib/main.c
@@ -1,6 +1,6 @@
 /* Yacc library main function.
 
-   Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/lib/subpipe.c b/lib/subpipe.c
index d7b67ce7..1b7c36d8 100644
--- a/lib/subpipe.c
+++ b/lib/subpipe.c
@@ -1,6 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2002, 2004, 2005, 2006, 2009 Free Software Foundation,
+   Copyright (C) 2002, 2004-2006, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/subpipe.h b/lib/subpipe.h
index f20a0d72..ff791a81 100644
--- a/lib/subpipe.h
+++ b/lib/subpipe.h
@@ -1,5 +1,6 @@
 /* Subprocesses with pipes.
-   Copyright (C) 2002, 2004, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2005, 2009-2010 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/timevar.c b/lib/timevar.c
index 77709e93..00faaf91 100644
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -1,5 +1,5 @@
 /* Timing variables for measuring compiler performance.
-   Copyright (C) 2000, 2002, 2004, 2005, 2006, 2009 Free Software
+   Copyright (C) 2000, 2002, 2004-2006, 2009-2010 Free Software
    Foundation, Inc.
    Contributed by Alex Samuel <samuel@codesourcery.com>
 
diff --git a/lib/timevar.def b/lib/timevar.def
index c2ec4d55..b8a53c54 100644
--- a/lib/timevar.def
+++ b/lib/timevar.def
@@ -1,6 +1,6 @@
 /* This file contains the definitions for timing variables used to -*- C -*-
    measure run-time performance of the compiler.
-   Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007, 2009-2010 Free Software Foundation, Inc.
    Contributed by Akim Demaille <akim@freefriends.org>.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/lib/timevar.h b/lib/timevar.h
index d2f061e8..52cc8e3e 100644
--- a/lib/timevar.h
+++ b/lib/timevar.h
@@ -1,5 +1,6 @@
 /* Timing variables for measuring compiler performance.
-   Copyright (C) 2000, 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004, 2009-2010 Free Software Foundation,
+   Inc.
    Contributed by Alex Samuel <samuel@codesourcery.com>
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/vbitset.c b/lib/vbitset.c
index 799d2a92..d82f0ec9 100644
--- a/lib/vbitset.c
+++ b/lib/vbitset.c
@@ -1,6 +1,5 @@
 /* Variable array bitsets.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/vbitset.h b/lib/vbitset.h
index d7b5891d..d9f3a2eb 100644
--- a/lib/vbitset.h
+++ b/lib/vbitset.h
@@ -1,5 +1,5 @@
 /* Functions to support vbitsets.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/yyerror.c b/lib/yyerror.c
index 208ecccb..8e554a09 100644
--- a/lib/yyerror.c
+++ b/lib/yyerror.c
@@ -1,6 +1,6 @@
 /* Yacc library error-printing function.
 
-   Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/m4/bison-i18n.m4 b/m4/bison-i18n.m4
index a416e3af..0c04c8e3 100644
--- a/m4/bison-i18n.m4
+++ b/m4/bison-i18n.m4
@@ -1,5 +1,5 @@
 # bison-i18n.m4 serial 2
-dnl Copyright (C) 2005-2006, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/c-working.m4 b/m4/c-working.m4
index 493a2268..f185812a 100644
--- a/m4/c-working.m4
+++ b/m4/c-working.m4
@@ -1,6 +1,6 @@
 # Sanity test a C compiler.
 
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/m4/cxx.m4 b/m4/cxx.m4
index 3d5f400e..f9c6508e 100644
--- a/m4/cxx.m4
+++ b/m4/cxx.m4
@@ -1,7 +1,7 @@
 # -*- Autoconf -*-
 # Sanity-test a C++ compiler.
 #
-# Copyright (C) 2004, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2009-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/m4/m4.m4 b/m4/m4.m4
index c6b64b08..a67b902b 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,7 +1,6 @@
 # m4.m4 serial 10
 
-# Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000, 2006-2010 Free Software Foundation, Inc.
 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/m4/subpipe.m4 b/m4/subpipe.m4
index 924a3196..774a8ab7 100644
--- a/m4/subpipe.m4
+++ b/m4/subpipe.m4
@@ -1,7 +1,8 @@
 # -*- Autoconf -*-
 # Checks required to run `subpipe'.
 #
-# Copyright (C) 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2003, 2005, 2009-2010 Free Software Foundation,
+# Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/m4/timevar.m4 b/m4/timevar.m4
index 4fcbbdfd..b10a55c7 100644
--- a/m4/timevar.m4
+++ b/m4/timevar.m4
@@ -1,7 +1,7 @@
 # -*- Autoconf -*-
 # Checks required to run `timevar', a time tracker.
 #
-# Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2003, 2009-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/LR0.c b/src/LR0.c
index 4725d6bc..fa563242 100644
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -1,7 +1,7 @@
 /* Generate the nondeterministic finite state machine for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2004, 2005, 2006,
-   2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2007, 2009-2010 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/LR0.h b/src/LR0.h
index 60e95afe..44188713 100644
--- a/src/LR0.h
+++ b/src/LR0.h
@@ -1,5 +1,5 @@
 /* Generate the nondeterministic finite state machine for bison,
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2009 Free Software
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2010 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/Makefile.am b/src/Makefile.am
index 467ee97b..329d113e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 # Make bison/src.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/assoc.c b/src/assoc.c
index 259877e8..308e2e87 100644
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,5 +1,6 @@
 /* Associativity information.
-   Copyright (C) 2002, 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/assoc.h b/src/assoc.h
index 3168f998..2102289e 100644
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,5 +1,5 @@
 /* Associativity information.
-   Copyright (C) 2002, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/closure.c b/src/closure.c
index 180e1dfc..b2f336aa 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,7 +1,7 @@
 /* Closures for Bison
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2010 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/closure.h b/src/closure.h
index f64b7d5e..143d8641 100644
--- a/src/closure.h
+++ b/src/closure.h
@@ -1,6 +1,6 @@
 /* Subroutines for bison
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2007, 2009 Free Software
+   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/complain.c b/src/complain.c
index c5fd1a96..d187624d 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2009 Free Software
+   Copyright (C) 2000-2002, 2004-2006, 2009-2010 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/src/complain.h b/src/complain.h
index 4b7eec58..9d24f254 100644
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002, 2006, 2009 Free Software Foundation,
+   Copyright (C) 2000-2002, 2006, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/src/conflicts.c b/src/conflicts.c
index 98959cff..21f1408d 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,7 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2007, 2009-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/conflicts.h b/src/conflicts.h
index 901e88a9..2b37db24 100644
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,5 @@
 /* Find and resolve or report lookahead conflicts for bison,
-   Copyright (C) 2000, 2001, 2002, 2004, 2007, 2009 Free Software
+   Copyright (C) 2000-2002, 2004, 2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/derives.c b/src/derives.c
index 7442ca87..2d60fd85 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,7 +1,7 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2005, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/derives.h b/src/derives.h
index d9de5b06..32978665 100644
--- a/src/derives.h
+++ b/src/derives.h
@@ -1,6 +1,6 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2009 Free Software
+   Copyright (C) 1984, 1989, 2000-2002, 2009-2010 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/files.c b/src/files.c
index 8d37a380..9761de92 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,7 +1,7 @@
 /* Open and close files for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/files.h b/src/files.h
index a75eda22..e8f28bff 100644
--- a/src/files.h
+++ b/src/files.h
@@ -1,6 +1,6 @@
 /* File names and variables for bison,
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2006, 2007, 2009 Free
+   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2010 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index b859049e..bb4ef72f 100644
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -1,6 +1,6 @@
 /* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
 
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/getargs.c b/src/getargs.c
index e750bfd4..f1fca05e 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,7 +1,7 @@
 /* Parse command line arguments for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/getargs.h b/src/getargs.h
index 1d12fee4..8277b98e 100644
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,7 +1,7 @@
 /* Parse command line arguments for bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/gram.c b/src/gram.c
index b854b983..fb566af7 100644
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003, 2005, 2006,
-   2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2007, 2009-2010 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/gram.h b/src/gram.h
index 1def4810..a82a6b40 100644
--- a/src/gram.h
+++ b/src/gram.h
@@ -1,7 +1,7 @@
 /* Data definitions for internal representation of Bison's input.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2010 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/graphviz.c b/src/graphviz.c
index 4c960035..3b483b5b 100644
--- a/src/graphviz.c
+++ b/src/graphviz.c
@@ -1,6 +1,6 @@
 /* Output Graphviz specification of a state machine generated by Bison.
 
-   Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lalr.c b/src/lalr.c
index 69e71172..42f4241e 100644
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,7 +1,7 @@
 /* Compute lookahead criteria for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2007, 2009-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lalr.h b/src/lalr.h
index b99ae355..3d406634 100644
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -1,7 +1,7 @@
 /* Compute lookahead criteria for bison,
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
+   2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/location.c b/src/location.c
index 4cbfd8db..380afea9 100644
--- a/src/location.c
+++ b/src/location.c
@@ -1,6 +1,5 @@
 /* Locations for Bison
-   Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2005-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/location.h b/src/location.h
index a99232bd..d8c4c8a8 100644
--- a/src/location.h
+++ b/src/location.h
@@ -1,6 +1,5 @@
 /* Locations for Bison
-   Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/main.c b/src/main.c
index 6f4b6b01..3b478918 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /* Top level entry point of Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002, 2004,
-   2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2007,
+   2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/muscle_tab.c b/src/muscle_tab.c
index 0137700f..570add70 100644
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -1,7 +1,6 @@
 /* Muscle table manager for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index a688f66f..0a772160 100644
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -1,5 +1,5 @@
 /* Muscle table manager for Bison,
-   Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009 Free Software
+   Copyright (C) 2001-2003, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/nullable.c b/src/nullable.c
index 51b876c5..b708059a 100644
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,7 +1,7 @@
 /* Calculate which nonterminals can expand into the null string for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2006, 2009-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/nullable.h b/src/nullable.h
index a8e9e28d..c3e11c1e 100644
--- a/src/nullable.h
+++ b/src/nullable.h
@@ -1,5 +1,5 @@
 /* Part of the bison parser generator,
-   Copyright (C) 2000, 2002, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/output.c b/src/output.c
index 759848f7..6a05704b 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/output.h b/src/output.h
index ed97ed79..bf805f51 100644
--- a/src/output.h
+++ b/src/output.h
@@ -1,5 +1,5 @@
 /* Output the generated parsing program for bison,
-   Copyright (C) 2000, 2001, 2002, 2003, 2006, 2007, 2009 Free Software
+   Copyright (C) 2000-2003, 2006-2007, 2009-2010 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 8b19ba8e..04a934ef 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,9 +1,9 @@
-/* A Bison parser, made by GNU Bison 2.4.1.58-3d04.  */
+/* A Bison parser, made by GNU Bison 2.4.1.61-f1ce.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
+   Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1.58-3d04"
+#define YYBISON_VERSION "2.4.1.61-f1ce"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -74,12 +74,11 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 190 of yacc.c  */
+/* Line 189 of yacc.c  */
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -149,8 +148,8 @@ static int current_prec = 0;
 #define YYTYPE_UINT8 uint_fast8_t
 
 
-/* Line 190 of yacc.c  */
-#line 154 "parse-gram.c"
+/* Line 189 of yacc.c  */
+#line 153 "parse-gram.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -298,8 +297,8 @@ static int current_prec = 0;
 typedef union YYSTYPE
 {
 
-/* Line 215 of yacc.c  */
-#line 92 "parse-gram.y"
+/* Line 214 of yacc.c  */
+#line 91 "parse-gram.y"
 
   symbol *symbol;
   symbol_list *list;
@@ -312,8 +311,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 215 of yacc.c  */
-#line 317 "parse-gram.c"
+/* Line 214 of yacc.c  */
+#line 316 "parse-gram.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -337,8 +336,8 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 265 of yacc.c  */
-#line 342 "parse-gram.c"
+/* Line 264 of yacc.c  */
+#line 341 "parse-gram.c"
 
 #ifdef short
 # undef short
@@ -663,17 +662,17 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   202,   202,   210,   212,   216,   217,   227,   228,   232,
-     233,   238,   239,   240,   241,   242,   243,   248,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   280,
-     281,   305,   306,   307,   308,   312,   313,   314,   318,   325,
-     332,   336,   340,   347,   362,   363,   367,   379,   379,   384,
-     384,   389,   400,   415,   416,   417,   421,   422,   427,   429,
-     434,   435,   440,   442,   447,   448,   452,   453,   454,   455,
-     460,   465,   470,   476,   482,   493,   494,   503,   504,   510,
-     511,   512,   519,   519,   523,   524,   525,   530,   531,   533,
-     535,   537,   539,   549,   550,   556,   559,   568,   588,   590,
-     599,   604,   605,   610,   617,   619
+       0,   201,   201,   209,   211,   215,   216,   226,   227,   231,
+     232,   237,   238,   239,   240,   241,   242,   247,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   279,
+     280,   304,   305,   306,   307,   311,   312,   313,   317,   324,
+     331,   335,   339,   346,   361,   362,   366,   378,   378,   383,
+     383,   388,   399,   414,   415,   416,   420,   421,   426,   428,
+     433,   434,   439,   441,   446,   447,   451,   452,   453,   454,
+     459,   464,   469,   475,   481,   492,   493,   502,   503,   509,
+     510,   511,   518,   518,   522,   523,   524,   529,   530,   532,
+     534,   536,   538,   548,   549,   555,   558,   567,   587,   589,
+     598,   603,   604,   609,   616,   618
 };
 #endif
 
@@ -1037,147 +1036,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
-/* Line 725 of yacc.c  */
-#line 180 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 179 "parse-gram.y"
 	{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 
-/* Line 725 of yacc.c  */
-#line 1046 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1045 "parse-gram.c"
 	break;
       case 4: /* "\"integer\"" */
 
-/* Line 725 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 190 "parse-gram.y"
 	{ fprintf (stderr, "%d", (yyvaluep->integer)); };
 
-/* Line 725 of yacc.c  */
-#line 1055 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1054 "parse-gram.c"
 	break;
       case 43: /* "\"{...}\"" */
 
-/* Line 725 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 
-/* Line 725 of yacc.c  */
-#line 1064 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1063 "parse-gram.c"
 	break;
       case 44: /* "\"char\"" */
 
-/* Line 725 of yacc.c  */
-#line 174 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 173 "parse-gram.y"
 	{ fputs (char_name ((yyvaluep->character)), stderr); };
 
-/* Line 725 of yacc.c  */
-#line 1073 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1072 "parse-gram.c"
 	break;
       case 45: /* "\"epilogue\"" */
 
-/* Line 725 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 725 of yacc.c  */
-#line 1082 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1081 "parse-gram.c"
 	break;
       case 47: /* "\"identifier\"" */
 
-/* Line 725 of yacc.c  */
-#line 187 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 186 "parse-gram.y"
 	{ fputs ((yyvaluep->uniqstr), stderr); };
 
-/* Line 725 of yacc.c  */
-#line 1091 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1090 "parse-gram.c"
 	break;
       case 48: /* "\"identifier:\"" */
 
-/* Line 725 of yacc.c  */
-#line 188 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 187 "parse-gram.y"
 	{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 
-/* Line 725 of yacc.c  */
-#line 1100 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1099 "parse-gram.c"
 	break;
       case 51: /* "\"%{...%}\"" */
 
-/* Line 725 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 725 of yacc.c  */
-#line 1109 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1108 "parse-gram.c"
 	break;
       case 53: /* "\"type\"" */
 
-/* Line 725 of yacc.c  */
-#line 186 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 185 "parse-gram.y"
 	{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 
-/* Line 725 of yacc.c  */
-#line 1118 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1117 "parse-gram.c"
 	break;
       case 82: /* "variable" */
 
-/* Line 725 of yacc.c  */
-#line 187 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 186 "parse-gram.y"
 	{ fputs ((yyvaluep->uniqstr), stderr); };
 
-/* Line 725 of yacc.c  */
-#line 1127 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1126 "parse-gram.c"
 	break;
       case 83: /* "content.opt" */
 
-/* Line 725 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 725 of yacc.c  */
-#line 1136 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1135 "parse-gram.c"
 	break;
       case 84: /* "braceless" */
 
-/* Line 725 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 725 of yacc.c  */
-#line 1145 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1144 "parse-gram.c"
 	break;
       case 85: /* "id" */
 
-/* Line 725 of yacc.c  */
-#line 194 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 193 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 725 of yacc.c  */
-#line 1154 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1153 "parse-gram.c"
 	break;
       case 86: /* "id_colon" */
 
-/* Line 725 of yacc.c  */
-#line 195 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 194 "parse-gram.y"
 	{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 
-/* Line 725 of yacc.c  */
-#line 1163 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1162 "parse-gram.c"
 	break;
       case 87: /* "symbol" */
 
-/* Line 725 of yacc.c  */
-#line 194 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 193 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 725 of yacc.c  */
-#line 1172 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1171 "parse-gram.c"
 	break;
       case 88: /* "string_as_id" */
 
-/* Line 725 of yacc.c  */
-#line 194 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 193 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 725 of yacc.c  */
-#line 1181 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1180 "parse-gram.c"
 	break;
       default:
 	break;
@@ -1696,8 +1695,8 @@ YYLTYPE yylloc;
 
 /* User initialization code.  */
 
-/* Line 1252 of yacc.c  */
-#line 84 "parse-gram.y"
+/* Line 1251 of yacc.c  */
+#line 83 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
@@ -1705,8 +1704,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
-/* Line 1252 of yacc.c  */
-#line 1710 "parse-gram.c"
+/* Line 1251 of yacc.c  */
+#line 1709 "parse-gram.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -1893,8 +1892,8 @@ yyreduce:
     {
         case 6:
 
-/* Line 1465 of yacc.c  */
-#line 218 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 217 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
@@ -1908,15 +1907,15 @@ yyreduce:
 
   case 7:
 
-/* Line 1465 of yacc.c  */
-#line 227 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 226 "parse-gram.y"
     { debug_flag = true; }
     break;
 
   case 8:
 
-/* Line 1465 of yacc.c  */
-#line 229 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 228 "parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
     }
@@ -1924,15 +1923,15 @@ yyreduce:
 
   case 9:
 
-/* Line 1465 of yacc.c  */
-#line 232 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 231 "parse-gram.y"
     { defines_flag = true; }
     break;
 
   case 10:
 
-/* Line 1465 of yacc.c  */
-#line 234 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 233 "parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
@@ -1941,43 +1940,43 @@ yyreduce:
 
   case 11:
 
-/* Line 1465 of yacc.c  */
-#line 238 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 237 "parse-gram.y"
     { error_verbose = true; }
     break;
 
   case 12:
 
-/* Line 1465 of yacc.c  */
-#line 239 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 238 "parse-gram.y"
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 
-/* Line 1465 of yacc.c  */
-#line 240 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 239 "parse-gram.y"
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 
-/* Line 1465 of yacc.c  */
-#line 241 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 240 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 
-/* Line 1465 of yacc.c  */
-#line 242 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 241 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 
-/* Line 1465 of yacc.c  */
-#line 244 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 243 "parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
@@ -1986,8 +1985,8 @@ yyreduce:
 
   case 17:
 
-/* Line 1465 of yacc.c  */
-#line 249 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 248 "parse-gram.y"
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
@@ -2000,78 +1999,78 @@ yyreduce:
 
   case 18:
 
-/* Line 1465 of yacc.c  */
-#line 257 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 256 "parse-gram.y"
     { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, &(yylsp[(1) - (2)])); }
     break;
 
   case 19:
 
-/* Line 1465 of yacc.c  */
-#line 258 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 257 "parse-gram.y"
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 
-/* Line 1465 of yacc.c  */
-#line 259 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 258 "parse-gram.y"
     { locations_flag = true; }
     break;
 
   case 21:
 
-/* Line 1465 of yacc.c  */
-#line 260 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 259 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 
-/* Line 1465 of yacc.c  */
-#line 261 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 260 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 
-/* Line 1465 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 261 "parse-gram.y"
     { no_lines_flag = true; }
     break;
 
   case 24:
 
-/* Line 1465 of yacc.c  */
-#line 263 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 262 "parse-gram.y"
     { nondeterministic_parser = true; }
     break;
 
   case 25:
 
-/* Line 1465 of yacc.c  */
-#line 264 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 263 "parse-gram.y"
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 
-/* Line 1465 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 264 "parse-gram.y"
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 
-/* Line 1465 of yacc.c  */
-#line 266 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 265 "parse-gram.y"
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 
-/* Line 1465 of yacc.c  */
-#line 268 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 267 "parse-gram.y"
     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use
          `%define api.pure' in a backward-compatible manner here.  First, don't
@@ -2088,15 +2087,15 @@ yyreduce:
 
   case 29:
 
-/* Line 1465 of yacc.c  */
-#line 280 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 279 "parse-gram.y"
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 30:
 
-/* Line 1465 of yacc.c  */
-#line 282 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 281 "parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
       if (strchr (skeleton_user, '/'))
@@ -2124,29 +2123,29 @@ yyreduce:
 
   case 31:
 
-/* Line 1465 of yacc.c  */
-#line 305 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 304 "parse-gram.y"
     { token_table_flag = true; }
     break;
 
   case 32:
 
-/* Line 1465 of yacc.c  */
-#line 306 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 305 "parse-gram.y"
     { report_flag |= report_states; }
     break;
 
   case 33:
 
-/* Line 1465 of yacc.c  */
-#line 307 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 306 "parse-gram.y"
     { yacc_flag = true; }
     break;
 
   case 37:
 
-/* Line 1465 of yacc.c  */
-#line 315 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 314 "parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }
@@ -2154,8 +2153,8 @@ yyreduce:
 
   case 38:
 
-/* Line 1465 of yacc.c  */
-#line 319 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 318 "parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2166,8 +2165,8 @@ yyreduce:
 
   case 39:
 
-/* Line 1465 of yacc.c  */
-#line 326 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 325 "parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2178,8 +2177,8 @@ yyreduce:
 
   case 40:
 
-/* Line 1465 of yacc.c  */
-#line 333 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 332 "parse-gram.y"
     {
       default_prec = true;
     }
@@ -2187,8 +2186,8 @@ yyreduce:
 
   case 41:
 
-/* Line 1465 of yacc.c  */
-#line 337 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 336 "parse-gram.y"
     {
       default_prec = false;
     }
@@ -2196,8 +2195,8 @@ yyreduce:
 
   case 42:
 
-/* Line 1465 of yacc.c  */
-#line 341 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 340 "parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
@@ -2208,8 +2207,8 @@ yyreduce:
 
   case 43:
 
-/* Line 1465 of yacc.c  */
-#line 348 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 347 "parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();
@@ -2218,22 +2217,22 @@ yyreduce:
 
   case 44:
 
-/* Line 1465 of yacc.c  */
-#line 362 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 361 "parse-gram.y"
     {}
     break;
 
   case 45:
 
-/* Line 1465 of yacc.c  */
-#line 363 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 362 "parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 46:
 
-/* Line 1465 of yacc.c  */
-#line 368 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 367 "parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
@@ -2243,15 +2242,15 @@ yyreduce:
 
   case 47:
 
-/* Line 1465 of yacc.c  */
-#line 379 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 378 "parse-gram.y"
     { current_class = nterm_sym; }
     break;
 
   case 48:
 
-/* Line 1465 of yacc.c  */
-#line 380 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 379 "parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
@@ -2260,15 +2259,15 @@ yyreduce:
 
   case 49:
 
-/* Line 1465 of yacc.c  */
-#line 384 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 383 "parse-gram.y"
     { current_class = token_sym; }
     break;
 
   case 50:
 
-/* Line 1465 of yacc.c  */
-#line 385 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 384 "parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
@@ -2277,8 +2276,8 @@ yyreduce:
 
   case 51:
 
-/* Line 1465 of yacc.c  */
-#line 390 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 389 "parse-gram.y"
     {
       symbol_list *list;
       tag_seen = true;
@@ -2290,8 +2289,8 @@ yyreduce:
 
   case 52:
 
-/* Line 1465 of yacc.c  */
-#line 401 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 400 "parse-gram.y"
     {
       symbol_list *list;
       ++current_prec;
@@ -2307,127 +2306,127 @@ yyreduce:
 
   case 53:
 
-/* Line 1465 of yacc.c  */
-#line 415 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 414 "parse-gram.y"
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 54:
 
-/* Line 1465 of yacc.c  */
-#line 416 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 415 "parse-gram.y"
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 55:
 
-/* Line 1465 of yacc.c  */
-#line 417 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 416 "parse-gram.y"
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 56:
 
-/* Line 1465 of yacc.c  */
-#line 421 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 420 "parse-gram.y"
     { current_type = NULL; }
     break;
 
   case 57:
 
-/* Line 1465 of yacc.c  */
-#line 422 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 421 "parse-gram.y"
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 58:
 
-/* Line 1465 of yacc.c  */
-#line 428 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 427 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 59:
 
-/* Line 1465 of yacc.c  */
-#line 430 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 429 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 60:
 
-/* Line 1465 of yacc.c  */
-#line 434 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 433 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
     break;
 
   case 61:
 
-/* Line 1465 of yacc.c  */
-#line 435 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 434 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
     break;
 
   case 62:
 
-/* Line 1465 of yacc.c  */
-#line 441 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 440 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 63:
 
-/* Line 1465 of yacc.c  */
-#line 443 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 442 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 64:
 
-/* Line 1465 of yacc.c  */
-#line 447 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 446 "parse-gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 65:
 
-/* Line 1465 of yacc.c  */
-#line 448 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 447 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 66:
 
-/* Line 1465 of yacc.c  */
-#line 452 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 451 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 67:
 
-/* Line 1465 of yacc.c  */
-#line 453 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 452 "parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 68:
 
-/* Line 1465 of yacc.c  */
-#line 454 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 453 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 69:
 
-/* Line 1465 of yacc.c  */
-#line 455 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 454 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 70:
 
-/* Line 1465 of yacc.c  */
-#line 461 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 460 "parse-gram.y"
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
@@ -2436,8 +2435,8 @@ yyreduce:
 
   case 71:
 
-/* Line 1465 of yacc.c  */
-#line 466 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 465 "parse-gram.y"
     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
        symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
@@ -2446,8 +2445,8 @@ yyreduce:
 
   case 72:
 
-/* Line 1465 of yacc.c  */
-#line 471 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 470 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
@@ -2457,8 +2456,8 @@ yyreduce:
 
   case 73:
 
-/* Line 1465 of yacc.c  */
-#line 477 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 476 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
@@ -2468,8 +2467,8 @@ yyreduce:
 
   case 74:
 
-/* Line 1465 of yacc.c  */
-#line 483 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 482 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
@@ -2480,8 +2479,8 @@ yyreduce:
 
   case 81:
 
-/* Line 1465 of yacc.c  */
-#line 513 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 512 "parse-gram.y"
     {
       yyerrok;
     }
@@ -2489,78 +2488,78 @@ yyreduce:
 
   case 82:
 
-/* Line 1465 of yacc.c  */
-#line 519 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 518 "parse-gram.y"
     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 
   case 84:
 
-/* Line 1465 of yacc.c  */
-#line 523 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 522 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 85:
 
-/* Line 1465 of yacc.c  */
-#line 524 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 523 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 87:
 
-/* Line 1465 of yacc.c  */
-#line 530 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 529 "parse-gram.y"
     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 88:
 
-/* Line 1465 of yacc.c  */
-#line 532 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 531 "parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 
   case 89:
 
-/* Line 1465 of yacc.c  */
-#line 534 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 533 "parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 90:
 
-/* Line 1465 of yacc.c  */
-#line 536 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 535 "parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 91:
 
-/* Line 1465 of yacc.c  */
-#line 538 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 537 "parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 92:
 
-/* Line 1465 of yacc.c  */
-#line 540 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 539 "parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 94:
 
-/* Line 1465 of yacc.c  */
-#line 550 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 549 "parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 95:
 
-/* Line 1465 of yacc.c  */
-#line 556 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 555 "parse-gram.y"
     {
       (yyval.chars) = "";
     }
@@ -2568,8 +2567,8 @@ yyreduce:
 
   case 97:
 
-/* Line 1465 of yacc.c  */
-#line 569 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 568 "parse-gram.y"
     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
@@ -2582,15 +2581,15 @@ yyreduce:
 
   case 98:
 
-/* Line 1465 of yacc.c  */
-#line 589 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 588 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 99:
 
-/* Line 1465 of yacc.c  */
-#line 591 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 590 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2600,15 +2599,15 @@ yyreduce:
 
   case 100:
 
-/* Line 1465 of yacc.c  */
-#line 599 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 598 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 103:
 
-/* Line 1465 of yacc.c  */
-#line 611 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 610 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2617,8 +2616,8 @@ yyreduce:
 
   case 105:
 
-/* Line 1465 of yacc.c  */
-#line 620 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 619 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
@@ -2631,8 +2630,8 @@ yyreduce:
 
 
 
-/* Line 1465 of yacc.c  */
-#line 2636 "parse-gram.c"
+/* Line 1464 of yacc.c  */
+#line 2635 "parse-gram.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2850,8 +2849,8 @@ yyreturn:
 
 
 
-/* Line 1685 of yacc.c  */
-#line 630 "parse-gram.y"
+/* Line 1684 of yacc.c  */
+#line 629 "parse-gram.y"
 
 
 
diff --git a/src/parse-gram.h b/src/parse-gram.h
index ffbcd3d8..133555d4 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,9 +1,9 @@
-/* A Bison parser, made by GNU Bison 2.4.1.58-3d04.  */
+/* A Bison parser, made by GNU Bison 2.4.1.61-f1ce.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
+   Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -159,8 +159,8 @@
 typedef union YYSTYPE
 {
 
-/* Line 1686 of yacc.c  */
-#line 92 "parse-gram.y"
+/* Line 1685 of yacc.c  */
+#line 91 "parse-gram.y"
 
   symbol *symbol;
   symbol_list *list;
@@ -173,7 +173,7 @@ typedef union YYSTYPE
 
 
 
-/* Line 1686 of yacc.c  */
+/* Line 1685 of yacc.c  */
 #line 178 "parse-gram.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 340e9946..5f10bcaa 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,7 +1,6 @@
 %{/* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print-xml.c b/src/print-xml.c
index f2ab781c..1ff7cf20 100644
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -1,6 +1,6 @@
 /* Print an xml on generated parser, for Bison,
 
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print-xml.h b/src/print-xml.h
index cb6f5ec1..0c99859b 100644
--- a/src/print-xml.h
+++ b/src/print-xml.h
@@ -1,6 +1,6 @@
 /* Output an xml of the generated parser, for Bison.
 
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print.c b/src/print.c
index 9801c175..57c70eb4 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,7 +1,7 @@
 /* Print information on generated parser, for bison,
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005,
-   2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2010 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print.h b/src/print.h
index 19f05057..bada3663 100644
--- a/src/print.h
+++ b/src/print.h
@@ -1,5 +1,5 @@
 /* Print information on generated parser, for bison,
-   Copyright (C) 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print_graph.c b/src/print_graph.c
index 86877c35..b9bd8eee 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,7 +1,6 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print_graph.h b/src/print_graph.h
index a2288cd3..0b86c2db 100644
--- a/src/print_graph.h
+++ b/src/print_graph.h
@@ -1,6 +1,6 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2000, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2006, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reader.c b/src/reader.c
index 38191ee6..19b1044b 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
-   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002, 2003,
-   2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
+   2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reader.h b/src/reader.h
index 6f3e5896..731bf9f8 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005-2007, 2009-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reduce.c b/src/reduce.c
index 67e72a36..733cd08c 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,7 +1,7 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 1988, 1989, 2000, 2001, 2002, 2003, 2005, 2006, 2007,
-   2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1988-1989, 2000-2003, 2005-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reduce.h b/src/reduce.h
index 2b6b8e58..b16ce256 100644
--- a/src/reduce.h
+++ b/src/reduce.h
@@ -1,6 +1,6 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2007, 2009 Free Software Foundation,
+   Copyright (C) 2000-2002, 2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/relation.c b/src/relation.c
index 32305221..c9b6331a 100644
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,5 +1,6 @@
 /* Binary relations.
-   Copyright (C) 2002, 2004, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2005, 2009-2010 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/relation.h b/src/relation.h
index 7af2ae83..1906db80 100644
--- a/src/relation.h
+++ b/src/relation.h
@@ -1,5 +1,5 @@
 /* Binary relations.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-code.h b/src/scan-code.h
index b282e5df..4160ebd4 100644
--- a/src/scan-code.h
+++ b/src/scan-code.h
@@ -1,6 +1,6 @@
 /* Bison code properties structure and scanner.
 
-   Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-code.l b/src/scan-code.l
index da5338a1..0e4bbe52 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -1,6 +1,6 @@
 /* Bison Action Scanner                             -*- C -*-
 
-   Copyright (C) 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-gram.h b/src/scan-gram.h
index decb545c..4fe819cb 100644
--- a/src/scan-gram.h
+++ b/src/scan-gram.h
@@ -1,6 +1,6 @@
 /* Bison Grammar Scanner
 
-   Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-gram.l b/src/scan-gram.l
index ee9f1174..61716810 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -1,7 +1,6 @@
 /* Bison Grammar Scanner                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-skel.h b/src/scan-skel.h
index 428c4d9d..bef1a335 100644
--- a/src/scan-skel.h
+++ b/src/scan-skel.h
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.
 
-   Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-skel.l b/src/scan-skel.l
index 8b3c5933..90a52dda 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,7 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/state.c b/src/state.c
index b2eef95e..3d310087 100644
--- a/src/state.c
+++ b/src/state.c
@@ -1,7 +1,6 @@
 /* Type definitions for nondeterministic finite state machine for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/state.h b/src/state.h
index 2811eb72..f16733e6 100644
--- a/src/state.h
+++ b/src/state.h
@@ -1,7 +1,7 @@
 /* Type definitions for nondeterministic finite state machine for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symlist.c b/src/symlist.c
index 3c9ff453..7b5021b9 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005, 2006, 2007, 2009 Free Software Foundation,
+   Copyright (C) 2002, 2005-2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/symlist.h b/src/symlist.h
index 034ad0dd..f0b7191a 100644
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005, 2006, 2007, 2009 Free Software Foundation,
+   Copyright (C) 2002, 2005-2007, 2009-2010 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/symtab.c b/src/symtab.c
index f748fcb0..93e5f194 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,7 +1,7 @@
 /* Symbol table manager for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006, 2007,
-   2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2010 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symtab.h b/src/symtab.h
index b12c421a..cae551bd 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,7 +1,7 @@
 /* Definitions for symtab.c and callers, part of Bison.
 
-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2004, 2005, 2006,
-   2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2007, 2009-2010 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/system.h b/src/system.h
index 8d2358c2..c5a685bc 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,7 +1,6 @@
 /* System-dependent definitions for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/tables.c b/src/tables.c
index 5d92aa4c..909a9b10 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2010 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/tables.h b/src/tables.h
index 6c20aceb..9ccc45d5 100644
--- a/src/tables.h
+++ b/src/tables.h
@@ -1,5 +1,5 @@
 /* Prepare the LALR and GLR parser tables.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/uniqstr.c b/src/uniqstr.c
index 78b8a98d..c9efb5d1 100644
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,6 +1,6 @@
 /* Keep a unique copy of strings.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2005, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/uniqstr.h b/src/uniqstr.h
index 319811d6..ceb908f8 100644
--- a/src/uniqstr.h
+++ b/src/uniqstr.h
@@ -1,6 +1,6 @@
 /* Keeping a unique copy of strings.
 
-   Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 05a35211..13516af8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,8 +2,7 @@
 
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-## 2008-2009 Free Software Foundation, Inc.
+## Copyright (C) 2000-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/actions.at b/tests/actions.at
index a5968831..aad5e81d 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,6 +1,5 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/atlocal.in b/tests/atlocal.in
index ef8bdb27..fc818490 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,8 +1,7 @@
 # @configure_input@					-*- shell-script -*-
 # Configurable variable values for Bison test suite.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# Copyright (C) 2000-2010 Free Software Foundation, Inc.
 
 # We need a C compiler.
 : ${CC='@CC@'}
diff --git a/tests/c++.at b/tests/c++.at
index 341e48ad..fa6ce9bd 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -1,5 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009-2010 Free Software Foundation,
+# Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/calc.at b/tests/calc.at
index 6b5f17e6..70ee395a 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,7 +1,6 @@
 # Simple calculator.                         -*- Autotest -*-
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2000-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/conflicts.at b/tests/conflicts.at
index 62da9698..abd88e7d 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,7 +1,7 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2005, 2007, 2009-2010 Free Software Foundation,
+# Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index 9daaa44e..9feb42b8 100644
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -1,6 +1,5 @@
 # Checking GLR Parsing.                         -*- Autotest -*-
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/existing.at b/tests/existing.at
index cd3b6501..4d1af422 100644
--- a/tests/existing.at
+++ b/tests/existing.at
@@ -1,7 +1,7 @@
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 
-# Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2010 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index e5d68374..dd24eb01 100644
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1,5 +1,5 @@
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009 Free Software
+# Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/headers.at b/tests/headers.at
index 66a606c7..02e517ab 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,6 +1,6 @@
 # Bison Parser Headers.                               -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2006, 2007, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2002, 2006-2007, 2009-2010 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/input.at b/tests/input.at
index 5cec25b9..4943190d 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -1,6 +1,5 @@
 # Checking the Bison scanner.                    -*- Autotest -*-
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2007, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/java.at b/tests/java.at
index ac6564f7..db0be29f 100644
--- a/tests/java.at
+++ b/tests/java.at
@@ -1,6 +1,6 @@
 # Java tests for simple calculator.           -*- Autotest -*-
 
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/local.at b/tests/local.at
index 96166a92..578f921f 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -1,8 +1,7 @@
 # Process this -*- Autotest -*- file with autom4te.
 
 # Macros for the GNU Bison Test suite.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008-2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/output.at b/tests/output.at
index e8f863d0..f8e16532 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,6 +1,5 @@
 # Checking the output filenames.                    -*- Autotest -*-
-# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000-2002, 2005-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/push.at b/tests/push.at
index f93af3b6..16099021 100644
--- a/tests/push.at
+++ b/tests/push.at
@@ -1,5 +1,5 @@
 # Checking Push Parsing.                            -*- Autotest -*-
-# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/reduce.at b/tests/reduce.at
index 6bdf73ce..d86bbbfe 100644
--- a/tests/reduce.at
+++ b/tests/reduce.at
@@ -1,6 +1,5 @@
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2007, 2008-2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2002, 2007-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/regression.at b/tests/regression.at
index 75573558..453cbd8e 100644
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1,7 +1,6 @@
 # Bison Regressions.                               -*- Autotest -*-
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/sets.at b/tests/sets.at
index 84070a6b..4c2a046b 100644
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -1,6 +1,6 @@
 # Exercising Bison Grammar Sets.                      -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2005, 2007, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2002, 2005, 2007, 2009-2010 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/skeletons.at b/tests/skeletons.at
index 60fc1176..f96d13e2 100644
--- a/tests/skeletons.at
+++ b/tests/skeletons.at
@@ -1,5 +1,5 @@
 # Checking skeleton support.                     -*- Autotest -*-
-# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/synclines.at b/tests/synclines.at
index 8653b460..08b33c5f 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,6 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2002, 2004, 2005, 2007, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2004-2005, 2007, 2009-2010 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 319acb7e..4ce6d05e 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,7 +1,7 @@
 # Test suite for GNU Bison.				-*- Autotest -*-
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000-2004, 2006-2007, 2009-2010 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/torture.at b/tests/torture.at
index 976c6f10..887af854 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,5 +1,5 @@
 # Torturing Bison.                                    -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Free Software
+# Copyright (C) 2001-2002, 2004-2007, 2009-2010 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
-- 
2.45.2