Merge from emacs-23

11 files changed, 12 insertions, 12 deletions

diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile
index a93b18b63cc..a041f7f14ab 100644
--- a/admin/charsets/Makefile
+++ b/admin/charsets/Makefile
@@ -1,5 +1,5 @@
 # Makefile -- Makefile to generate charset maps in etc/charsets.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 #
diff --git a/admin/charsets/big5.awk b/admin/charsets/big5.awk
index a0113a6677c..7cae450ba53 100644
--- a/admin/charsets/big5.awk
+++ b/admin/charsets/big5.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk
index f84715e1d8d..83b5a7f0e34 100644
--- a/admin/charsets/compact.awk
+++ b/admin/charsets/compact.awk
@@ -1,5 +1,5 @@
 # compact.awk -- Make charset map compact.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index 387f314fe37..6cf2f37dbd3 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -1,5 +1,5 @@
 # cp51932.awk -- Generate a translation table for CP51932.
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
diff --git a/admin/charsets/cp932.awk b/admin/charsets/cp932.awk
index 397f025acee..d6f1966894e 100644
--- a/admin/charsets/cp932.awk
+++ b/admin/charsets/cp932.awk
@@ -1,5 +1,5 @@
 # cp932.awk -- Add sort keys and append user defined area to CP932-2BYTE.map.
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk
index f5876777b01..15803525997 100644
--- a/admin/charsets/eucjp-ms.awk
+++ b/admin/charsets/eucjp-ms.awk
@@ -1,5 +1,5 @@
 # eucjp-ms.awk -- Generate a translation table for eucJP-ms.
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk
index fd8748f50be..7b89c903beb 100644
--- a/admin/charsets/gb180302.awk
+++ b/admin/charsets/gb180302.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk
index 43e2b474841..c1b691b9a63 100644
--- a/admin/charsets/gb180304.awk
+++ b/admin/charsets/gb180304.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 89943074939..deb69e2a1a9 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index 3e09cfd098f..a47c5d7b733 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -1,5 +1,5 @@
-Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-Copyright (C) 2009, 2010
+Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009
 See the end of the file for license conditions.
diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el
index 07708bcd5a4..6234471e9eb 100644
--- a/admin/charsets/mule-charsets.el
+++ b/admin/charsets/mule-charsets.el
@@ -1,5 +1,5 @@
 ;; mule-charsets.el -- Generate Mule-orignal charset maps.
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009