From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 19 Mar 2013 22:07:22 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6971804318e4645f34511d3116f51af2d42ca77;p=python

merge heads
---

f6971804318e4645f34511d3116f51af2d42ca77