From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 24 Jan 2014 05:33:25 +0000 (-0500)
Subject: merge 3.3 (#20374)
X-Git-Tag: v3.4.0b3~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f81c3cf3f76ec7991f3c367926faf07357a465e;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20374)
---

8f81c3cf3f76ec7991f3c367926faf07357a465e