From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 24 May 2013 21:36:04 +0000 (-0700)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~645
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e08b583d8828adefa6fba097a5c1405d78dbc759;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

e08b583d8828adefa6fba097a5c1405d78dbc759