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

merge
---

0bc4329cda62d3c84fbae8560ee33577b1bc903c