From: Brett Cannon <brett@python.org>
Date: Sat, 26 Jan 2013 13:49:53 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.4.0a1~1521
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e103d689acf796a132eea9358981614171836fad;p=thirdparty%2FPython%2Fcpython.git

merge
---

e103d689acf796a132eea9358981614171836fad