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

merge 3.3
---

30f240150ecf4ff1c90443bc764f5fb77c39b783