From: Kurt B. Kaiser <kbk@shore.net>
Date: Wed, 23 Mar 2011 00:05:18 +0000 (-0400)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~2766^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4364806a7cf978d70d8bfabac439036d244a73e3;p=python

Merge from 3.2
---

4364806a7cf978d70d8bfabac439036d244a73e3