From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Jul 2013 21:07:19 +0000 (-0700)
Subject: merge 3.3 (#18565)
X-Git-Tag: v3.4.0a1~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=290371dadc215770bbea1d84e6e9c1d93f155a0e;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#18565)
---

290371dadc215770bbea1d84e6e9c1d93f155a0e