From: Brian Curtin <brian@python.org>
Date: Thu, 27 Dec 2012 20:12:43 +0000 (-0600)
Subject: Merge
X-Git-Tag: v3.3.1rc1~472^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9eac6b3848d6f6a59187199520144709ddcb3567;p=python

Merge
---

9eac6b3848d6f6a59187199520144709ddcb3567