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

Merge 3.2
---

e6bfa2911ad061c664fdd09515a32c52e18b871c