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

merge 3.3
---

67266d1993b96867f85dc90d89fbe1019f0471f4