From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 18 Oct 2013 16:58:17 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a4~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=559ae0fb1c4b071fb919ddc10144dd3bf80db07e;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

559ae0fb1c4b071fb919ddc10144dd3bf80db07e