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

Merge #12228
---

bb66972c0b263278b6468e59a240af5c7b771966