From: Brett Cannon <brett@python.org>
Date: Sat, 4 May 2013 22:11:30 +0000 (-0400)
Subject: merge w/ 3.3
X-Git-Tag: v3.4.0a1~800
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0470cc9416463820e7928ac3e4c31a45ba532d79;p=thirdparty%2FPython%2Fcpython.git

merge w/ 3.3
---

0470cc9416463820e7928ac3e4c31a45ba532d79