From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 12 Mar 2011 11:17:26 +0000 (+0000)
Subject: Merge #11131
X-Git-Tag: v3.2.1b1~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7f0dffb8d690ea00bbe99098be5a601835ec267;p=python

Merge #11131
---

a7f0dffb8d690ea00bbe99098be5a601835ec267