From: Brett Cannon <brett@python.org>
Date: Fri, 11 Mar 2011 22:46:21 +0000 (-0500)
Subject: merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceae11de9bc30a6e57a467bcd13fc4d7e2ba551c;p=python

merge
---

ceae11de9bc30a6e57a467bcd13fc4d7e2ba551c