From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Sun, 30 Sep 2012 16:46:04 +0000 (-0700)
Subject: Issue #15533: Merge update from 3.2.
X-Git-Tag: v3.4.0a1~2439^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a6ada8026eaa934982008e8ca4af8d40e8f57fd;p=thirdparty%2FPython%2Fcpython.git

Issue #15533: Merge update from 3.2.
---

9a6ada8026eaa934982008e8ca4af8d40e8f57fd