commit c6fbf47b28173c7bbac9a9e19201876d945859d3
author Benjamin Peterson <benjamin@python.org> Fri Feb 24 11:49:07 2012 -0500
committer Benjamin Peterson <benjamin@python.org> Fri Feb 24 11:49:07 2012 -0500
tree 8bfa5742c45c72766c61f80c875abd6c34652902
parent 6eaaeff00e43fe86ea2b832fdb9bf497eab742f7
parent 625cd23da4e760311bd81d8f3f7edba809e981d8

merge heads

.hgtags

diff --git a/.hgtags b/.hgtags
index 7ac43b0..0830aaf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -94,3 +94,4 @@
 ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
 c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
 137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
+7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1

PC/python_nt.rc

diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index 8cccf2d..5295610 100644
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -61,7 +61,7 @@
             VALUE "FileDescription", "Python Core\0"
             VALUE "FileVersion", PYTHON_VERSION
             VALUE "InternalName", "Python DLL\0"
-            VALUE "LegalCopyright", "Copyright © 2001-2011 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
+            VALUE "LegalCopyright", "Copyright © 2001-2012 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
             VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
             VALUE "ProductName", "Python\0"
             VALUE "ProductVersion", PYTHON_VERSION