From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 17 Jul 2011 23:22:05 +0000 (-0700)
Subject: Merged upstream.
X-Git-Tag: v3.3.0a1~1881^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b05be7d936051a04a529fb7ad63731aeabe0fb9b;p=thirdparty%2FPython%2Fcpython.git

Merged upstream.
---

b05be7d936051a04a529fb7ad63731aeabe0fb9b