From: Brett Cannon <brett@python.org>
Date: Tue, 15 Mar 2011 22:45:59 +0000 (-0400)
Subject: merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f47e3ac7b79db4f95ed812b5f819317144f35c7f;p=python

merge
---

f47e3ac7b79db4f95ed812b5f819317144f35c7f