Merged revisions 77389 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77389 | benjamin.peterson | 2010-01-09 12:45:30 -0600 (Sat, 09 Jan 2010) | 25 lines

  Merged revisions 77209,77229,77359-77360,77371 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77209 | georg.brandl | 2010-01-01 07:07:05 -0600 (Fri, 01 Jan 2010) | 1 line

    More yearly updates.
  ........
    r77229 | georg.brandl | 2010-01-02 06:35:01 -0600 (Sat, 02 Jan 2010) | 1 line

    Fix casing.
  ........
    r77359 | georg.brandl | 2010-01-07 14:54:45 -0600 (Thu, 07 Jan 2010) | 1 line

    Fix description for Py_GetPath(); it sounded like it always returned sys.path.
  ........
    r77360 | georg.brandl | 2010-01-07 15:48:47 -0600 (Thu, 07 Jan 2010) | 1 line

    #7653: clarify how the PythonPath registry key should look like.
  ........
    r77371 | senthil.kumaran | 2010-01-08 13:20:25 -0600 (Fri, 08 Jan 2010) | 3 lines

    Fix for Issue7026. For the Error - RuntimeError: dictionary changed size during iteration
  ........
................
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 25885c7..4ffc8f9 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2007 Python Software Foundation
+# Copyright (C) 2001-2010 Python Software Foundation
 # Contact: email-sig@python.org
 # email package unit tests