From: Brett Cannon <brett@python.org>
Date: Tue, 25 Sep 2012 19:23:49 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.1rc1~818^2^2~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=847bb76f18b8b0059bcd3ee8cb428069ca7932ec;p=thirdparty%2FPython%2Fcpython.git

merge
---

847bb76f18b8b0059bcd3ee8cb428069ca7932ec