merge 3.1

diff --cc Lib/http/cookiejar.py
Simple merge

diff --cc Misc/NEWS
index 49626f1af44db4c2f0e6f4e66ca929e2d00cc3e6,90e1ab1a92864b1c94c42c2b1b167b89368ccd79..5dc8a6491816a72a96e4adb4e825a94c500c03de
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -49,10 -40,9 +49,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #5537: Fix time2isoz() and time2netscape() functions of
+   httplib.cookiejar for expiration year greater than 2038 on 32-bit systems.
+ 
 +- Issue #11563: Connection:close header is sent by requests using URLOpener
 +  class which helps in closing of sockets after connection is over. Patch
 +  contributions by Jeff McNeil and Nadeem Vawda.
 +
  - Issue #11459: A ``bufsize`` value of 0 in subprocess.Popen() really creates
    unbuffered pipes, such that select() works properly on them.