From: Mark Dickinson <mdickinson@enthought.com>
Date: Fri, 24 Aug 2012 18:40:25 +0000 (+0100)
Subject: Null merge from 3.2.
X-Git-Tag: v3.3.0rc1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=451097737b761b1858efb6083165d737e3a9a387;p=python

Null merge from 3.2.
---

451097737b761b1858efb6083165d737e3a9a387