From: Brett Cannon <brett@python.org>
Date: Tue, 6 Mar 2012 20:33:24 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.3.0a2~276
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f67e494ca8dfc72c0f812ed46c6a08ad3b9ddc24;p=python

merge
---

f67e494ca8dfc72c0f812ed46c6a08ad3b9ddc24