From: Brett Cannon <brett@python.org>
Date: Fri, 11 Jan 2013 20:44:00 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.3.1rc1~379
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed6b4c0020279c31b2c46107aac63b7a9170b907;p=thirdparty%2FPython%2Fcpython.git

merge
---

ed6b4c0020279c31b2c46107aac63b7a9170b907