From: Brett Cannon <brett@python.org>
Date: Sat, 25 May 2013 15:33:13 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~636
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b961955e95107e7667944e91bea50bfb760285b7;p=thirdparty%2FPython%2Fcpython.git

merge
---

b961955e95107e7667944e91bea50bfb760285b7