From: Kurt B. Kaiser <kbk@shore.net>
Date: Fri, 25 Mar 2011 04:22:09 +0000 (-0400)
Subject: Merge 3.2 heads
X-Git-Tag: v3.2.1b1~218
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=439dfffaf3223c54ae1c2cdb67da8ccb055dca4c;p=python

Merge 3.2 heads
---

439dfffaf3223c54ae1c2cdb67da8ccb055dca4c