From: Kurt B. Kaiser <kbk@shore.net>
Date: Fri, 25 Mar 2011 04:32:23 +0000 (-0400)
Subject: Merge from 3.2 again
X-Git-Tag: v3.3.0a1~2762
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07b29a07ad1ae76b132dc34c4d060ca43576ea96;p=python

Merge from 3.2 again
---

07b29a07ad1ae76b132dc34c4d060ca43576ea96