From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 17 Aug 2012 19:42:12 +0000 (-0400)
Subject: Merge with 3.2 #15660
X-Git-Tag: v3.3.0rc1~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbfe573d9d5fbae478199ccff07c39f5b2de499d;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2 #15660
---

bbfe573d9d5fbae478199ccff07c39f5b2de499d