From: Michael Foord <michael@voidspace.org.uk>
Date: Mon, 18 Mar 2013 22:04:33 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.4.0a1~1175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35266f78b772bd7b13dc118206fa583264b1b2d3;p=python

Merge
---

35266f78b772bd7b13dc118206fa583264b1b2d3