From: Brett Cannon <brett@python.org>
Date: Sun, 17 Mar 2013 22:49:21 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a1~1185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a948a7eeee0090a10aaaf97c1b4093090acf184;p=thirdparty%2FPython%2Fcpython.git

merge
---

5a948a7eeee0090a10aaaf97c1b4093090acf184