From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 18:49:26 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a4~311^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b321fe1f274a3186e86c3982da76cf71f2050f0c;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

b321fe1f274a3186e86c3982da76cf71f2050f0c