From: Kurt B. Kaiser <kbk@shore.net>
Date: Fri, 25 Mar 2011 04:30:40 +0000 (-0400)
Subject: Merge from 3.1 again
X-Git-Tag: v3.2.1b1~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32a95a70c919be46f1fa65e0b4d98368cda768e6;p=python

Merge from 3.1 again
---

32a95a70c919be46f1fa65e0b4d98368cda768e6