From: Brett Cannon <brett@python.org>
Date: Fri, 27 Apr 2012 19:31:45 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d3b3218be62b723d8aaea1676e8eb7d7b937649;p=python

merge
---

6d3b3218be62b723d8aaea1676e8eb7d7b937649