From: Gregory P. Smith <greg@krypto.org>
Date: Sat, 2 Feb 2013 00:15:01 +0000 (-0800)
Subject: null merge from 3.2 (3.3's code already refactored)
X-Git-Tag: v3.3.1rc1~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2da96b3bbc40d7fbeb3208a59c28db4f5783e10;p=thirdparty%2FPython%2Fcpython.git

null merge from 3.2 (3.3's code already refactored)
---

b2da96b3bbc40d7fbeb3208a59c28db4f5783e10