From: Brian Curtin <brian@python.org>
Date: Mon, 17 Dec 2012 06:06:02 +0000 (-0600)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~1839
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f494e8f2a5c1daf9508297c265f012ba8dc46dde;p=python

Merge 3.3
---

f494e8f2a5c1daf9508297c265f012ba8dc46dde