From: Mark Dickinson <mdickinson@enthought.com>
Date: Mon, 24 Sep 2012 19:17:17 +0000 (+0100)
Subject: Issue #14167: merge fix from 3.2 branch.
X-Git-Tag: v3.3.1rc1~818^2^2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33d8ce1f0f9f8151abadec10c37d439aa17b29ef;p=thirdparty%2FPython%2Fcpython.git

Issue #14167: merge fix from 3.2 branch.
---

33d8ce1f0f9f8151abadec10c37d439aa17b29ef