From: Gregory P. Smith <greg@krypto.org>
Date: Thu, 16 Feb 2012 08:36:04 +0000 (-0800)
Subject: merge.
X-Git-Tag: v3.3.0a1~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18aec4ce8973f17352c4ba6e837f5b75528fd65e;p=python

merge.
---

18aec4ce8973f17352c4ba6e837f5b75528fd65e