From: Mark Dickinson <mdickinson@enthought.com>
Date: Thu, 20 Sep 2012 20:30:34 +0000 (+0100)
Subject: Issue 15959: Merge from 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~64^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5710c2a3e8d6e6e6a0830648e8e2be906c2c963d;p=thirdparty%2FPython%2Fcpython.git

Issue 15959: Merge from 3.2.
---

5710c2a3e8d6e6e6a0830648e8e2be906c2c963d