From: Mark Dickinson <mdickinson@enthought.com>
Date: Sun, 29 Apr 2012 21:20:01 +0000 (+0100)
Subject: Issue #14696: Merge from 3.2
X-Git-Tag: v3.3.0a3~28^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57404891a05fe1d5a70fc55ae84e75fe12fc7535;p=python

Issue #14696: Merge from 3.2
---

57404891a05fe1d5a70fc55ae84e75fe12fc7535