From: Gregory P. Smith <greg@krypto.org>
Date: Wed, 14 Mar 2012 22:04:57 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a2~189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f22568563ba75b2fe94530f7e0618783a2a77d48;p=python

merge
---

f22568563ba75b2fe94530f7e0618783a2a77d48