From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 15 Mar 2011 19:52:09 +0000 (-0400)
Subject: merge 3.2 heads
X-Git-Tag: v3.2.1b1~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdc4f963cc6196d0b00985f6d5d980fab25c5a98;p=python

merge 3.2 heads
---

cdc4f963cc6196d0b00985f6d5d980fab25c5a98