From: Barry Warsaw <barry@python.org>
Date: Mon, 4 Jun 2012 13:41:48 +0000 (-0400)
Subject: Trunk merge.
X-Git-Tag: v3.3.0b1~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c58c392da7f8fb49b84b2f4de35d3c40ed6d36c1;p=python

Trunk merge.
---

c58c392da7f8fb49b84b2f4de35d3c40ed6d36c1