From: Michael Foord <michael@python.org>
Date: Mon, 14 Mar 2011 23:03:30 +0000 (-0400)
Subject: merge default
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee354eabc996ed532bcd648e628d367468b6c00c;p=python

merge default
---

ee354eabc996ed532bcd648e628d367468b6c00c