From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 19 Mar 2013 22:31:05 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.4.0a1~1154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f4dfd1c071ce41d72cf1e95071cf3340f50b418;p=python

merge heads
---

2f4dfd1c071ce41d72cf1e95071cf3340f50b418