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

merge 3.3
---

bbd392e9e2b8f7f69b649488828e559c788d5f3e