From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 25 Jun 2011 10:04:08 +0000 (+0200)
Subject: Merge #12228
X-Git-Tag: v3.2.1rc2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e4b5c6773bc1c134fad73679294e2afc0ee8924;p=thirdparty%2FPython%2Fcpython.git

Merge #12228
---

7e4b5c6773bc1c134fad73679294e2afc0ee8924