From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 4 Apr 2014 13:52:05 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cd9825457604b04fcfeb0679ea30f98fd294efd;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

1cd9825457604b04fcfeb0679ea30f98fd294efd