From: Gregory P. Smith <greg@krypto.org>
Date: Sun, 24 Jun 2012 07:24:31 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0b1~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=853ef475228e6fb9683209b361878e8f610e3762;p=python

merge heads
---

853ef475228e6fb9683209b361878e8f610e3762