From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Dec 2013 21:37:03 +0000 (-0600)
Subject: merge 3.3 (#20018)
X-Git-Tag: v3.4.0b2~181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc45f173a3485b024a96f6e891db08efdaf34722;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20018)
---

fc45f173a3485b024a96f6e891db08efdaf34722