From: Brett Cannon <brett@python.org>
Date: Fri, 6 Apr 2012 16:54:57 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~294^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83c02ee8e8d62dbdd1576f2d02a7925b4381cc02;p=python

merge
---

83c02ee8e8d62dbdd1576f2d02a7925b4381cc02