From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 25 Jun 2011 11:29:49 +0000 (+0200)
Subject: Issue #12408: Merge.
X-Git-Tag: v3.3.0a1~2053
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36a9de041ba4af3e6df011f8f577fd75b25002eb;p=thirdparty%2FPython%2Fcpython.git

Issue #12408: Merge.
---

36a9de041ba4af3e6df011f8f577fd75b25002eb