From: Mark Dickinson <mdickinson@enthought.com>
Date: Thu, 20 Sep 2012 19:51:53 +0000 (+0100)
Subject: Issue 15985: merge from 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c6c80d89f60c9b28cfb08d32c61108b16b2461a;p=thirdparty%2FPython%2Fcpython.git

Issue 15985: merge from 3.2.
---

7c6c80d89f60c9b28cfb08d32c61108b16b2461a