From: Barry Warsaw <barry@python.org>
Date: Mon, 23 May 2011 01:17:49 +0000 (-0400)
Subject: Forward merge.
X-Git-Tag: v2.7.2rc1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0406d966a13f55002583244f41b8dc8fbdd2ed9e;p=python

Forward merge.
---

0406d966a13f55002583244f41b8dc8fbdd2ed9e