From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 1 Mar 2014 07:04:10 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~233^2~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b96f76dc85a35cc5aa5d33baf43ad882fb54582;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

7b96f76dc85a35cc5aa5d33baf43ad882fb54582