From: Barry Warsaw <barry@python.org>
Date: Tue, 19 Jul 2011 23:28:16 +0000 (-0400)
Subject: Upstream merge.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4c383b8b3d8587d16229610dde51e0949264e38;p=python

Upstream merge.
---

a4c383b8b3d8587d16229610dde51e0949264e38