Changing the CNRI copyright notice according to CNRI's instructions.
This is a notice without a date, which apparently is not a claim to
copyright but only advice to the reader.  IANAL. :-)
diff --git a/Include/codecs.h b/Include/codecs.h
index 708d476..eee74a7 100644
--- a/Include/codecs.h
+++ b/Include/codecs.h
@@ -11,7 +11,7 @@
 
 Written by Marc-Andre Lemburg (mal@lemburg.com).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */
 
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 95e9f02..af3a376 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -7,7 +7,7 @@
 modified by Marc-Andre Lemburg (mal@lemburg.com) according to the
 Unicode Integration Proposal (see file Misc/unicode.txt).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
 
  Original header:
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
index 3b117e6..53e63c5 100644
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -31,7 +31,7 @@
 
 Written by Marc-Andre Lemburg (mal@lemburg.com).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */
 
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 890fb97..36c6566 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -6,7 +6,7 @@
 
 Written by Marc-Andre Lemburg (mal@lemburg.com).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */
 
diff --git a/Modules/unicodedatabase.c b/Modules/unicodedatabase.c
index e5904ee..0589176 100644
--- a/Modules/unicodedatabase.c
+++ b/Modules/unicodedatabase.c
@@ -6,7 +6,7 @@
 
 Written by Marc-Andre Lemburg (mal@lemburg.com).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */
 
diff --git a/Modules/unicodedatabase.h b/Modules/unicodedatabase.h
index c89d91e..b4bc1c6 100644
--- a/Modules/unicodedatabase.h
+++ b/Modules/unicodedatabase.h
@@ -6,7 +6,7 @@
 
 Written by Marc-Andre Lemburg (mal@lemburg.com).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */
 
diff --git a/Objects/unicodectype.c b/Objects/unicodectype.c
index 4fc1204..dacdd1a 100644
--- a/Objects/unicodectype.c
+++ b/Objects/unicodectype.c
@@ -6,7 +6,7 @@
 
 Written by Marc-Andre Lemburg (mal@lemburg.com).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
 */
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 7a3eb22..1adc743 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4,7 +4,7 @@
 modified by Marc-Andre Lemburg <mal@lemburg.com> according to the
 Unicode Integration Proposal (see file Misc/unicode.txt).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
 
  Original header:
diff --git a/Python/codecs.c b/Python/codecs.c
index 0a315d9..c3f93cc 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -4,7 +4,7 @@
 
 Written by Marc-Andre Lemburg (mal@lemburg.com).
 
-(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */