From: Brett Cannon <brett@python.org>
Date: Sun, 29 Apr 2012 18:38:57 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6818832ff63e39cbb058d14e10bfadf7afadfb7f;p=python

merge
---

6818832ff63e39cbb058d14e10bfadf7afadfb7f