From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 23 Jun 2012 08:28:08 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.3.0b1~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=970da4549ab78ad6f89dd0cce0d2defc771e1c72;p=python

merge
---

970da4549ab78ad6f89dd0cce0d2defc771e1c72