From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 27 Feb 2014 18:50:28 +0000 (-0500)
Subject: merge 3.3 (#20796)
X-Git-Tag: v3.4.1rc1~233^2~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85736a7d2c4fcb0369becf59b143e5035a2adc23;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20796)
---

85736a7d2c4fcb0369becf59b143e5035a2adc23