From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Dec 2012 18:04:44 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1913
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=181e20a6fc178f97741eef1176f660ad5447ea8b;p=python

merge 3.3
---

181e20a6fc178f97741eef1176f660ad5447ea8b