From: Mark Dickinson <mdickinson@enthought.com>
Date: Sun, 27 Mar 2011 15:30:50 +0000 (+0100)
Subject: Merge #9696
X-Git-Tag: v3.3.0a1~2736^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=574980e946bf6793dc9a1b68f6ed3084fd4d83f1;p=thirdparty%2FPython%2Fcpython.git

Merge #9696
---

574980e946bf6793dc9a1b68f6ed3084fd4d83f1