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

merge 3.3
---

af9049ebbc371333219bdf2b62c27a889706b12d