From: Brett Cannon <brett@python.org>
Date: Fri, 1 Feb 2013 21:39:50 +0000 (-0500)
Subject: merge from 3.3
X-Git-Tag: v3.4.0a1~1481
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b67d7af8a8d27041d03212b2fbfafecbb8795cc;p=thirdparty%2FPython%2Fcpython.git

merge from 3.3
---

6b67d7af8a8d27041d03212b2fbfafecbb8795cc