From: Kurt B. Kaiser <kbk@shore.net>
Date: Thu, 24 Mar 2011 16:51:10 +0000 (-0400)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2766^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73979c3149e54a437bd17661d51e204f8f870bd9;p=python

Merge 3.2
---

73979c3149e54a437bd17661d51e204f8f870bd9