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

merge 3.3
---

466eaaa5d107d0adcfc194d5d94e346a6b807c9d