From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 23 Jun 2012 11:13:15 +0000 (+0100)
Subject: Issue #12965: Merge from 3.2.
X-Git-Tag: v3.3.0b1~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9aa8425c40e44362dd6abf0b60eb18b68539605;p=thirdparty%2FPython%2Fcpython.git

Issue #12965: Merge from 3.2.
---

c9aa8425c40e44362dd6abf0b60eb18b68539605