From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Mar 2014 00:16:51 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~233^2~159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=150570a573cb0e5d0ca5d1ae1d59c99e97689d96;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

150570a573cb0e5d0ca5d1ae1d59c99e97689d96