From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Wed, 21 Nov 2012 01:44:02 +0000 (-0800)
Subject: Null merge from 3.2 (issue #13538).
X-Git-Tag: v3.3.1rc1~610
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ddfb19e4197be4abc0b74236f207a3efc853c04;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.2 (issue #13538).
---

9ddfb19e4197be4abc0b74236f207a3efc853c04