From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 15 Mar 2011 06:15:13 +0000 (-0400)
Subject: merge 1579808ef25b
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58e317ba921bf5f9ce18fcf561a11e9b5bd6914c;p=python

merge 1579808ef25b
---

58e317ba921bf5f9ce18fcf561a11e9b5bd6914c