From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 6 Oct 2012 17:05:14 +0000 (+0100)
Subject: Issue #16096: Merge fixes from 3.3.
X-Git-Tag: v3.4.0a1~2337
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff9c54aca28592a3eab0bdba1ddd977b441e1e9f;p=python

Issue #16096: Merge fixes from 3.3.
---

ff9c54aca28592a3eab0bdba1ddd977b441e1e9f