From: Mark Dickinson <mdickinson@enthought.com>
Date: Fri, 24 Aug 2012 19:32:24 +0000 (+0100)
Subject: Null merge from 3.2
X-Git-Tag: v3.3.0rc1~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a54d16dc5684a2279bf3bd1e6bbb10c74c09850;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.2
---

7a54d16dc5684a2279bf3bd1e6bbb10c74c09850