From: Mark Dickinson <mdickinson@enthought.com>
Date: Fri, 27 Jan 2012 21:17:04 +0000 (+0000)
Subject: Merge 3.2 -> default (issue 13889)
X-Git-Tag: v3.3.0a1~290
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=963816defca26c8817b0185c245f7b30ae365f23;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2 -> default (issue 13889)
---

963816defca26c8817b0185c245f7b30ae365f23