From: Brian Curtin <brian@python.org>
Date: Thu, 27 Dec 2012 20:06:38 +0000 (-0600)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~1756^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8704fb24ef547b066e43f81d0e2e3f4ca427296;p=python

Merge 3.3
---

f8704fb24ef547b066e43f81d0e2e3f4ca427296