From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 15 Mar 2014 02:47:36 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~233^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfa822811a1a39cbf7cefc747b7b642a6c6e1357;p=python

merge 3.3
---

dfa822811a1a39cbf7cefc747b7b642a6c6e1357