From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 23 Jun 2012 09:49:36 +0000 (+0100)
Subject: Issue #12965: Merge from 3.2
X-Git-Tag: v3.3.0b1~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=766e62266e72d7586e8cbf74213a3935a974ef14;p=python

Issue #12965: Merge from 3.2
---

766e62266e72d7586e8cbf74213a3935a974ef14