From: Michael Foord <michael@voidspace.org.uk>
Date: Mon, 14 Apr 2014 15:26:38 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.4.1rc1~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b16436c00aaabb3ec10c49ff4cc131c6aa9f4ca;p=python

Merge
---

1b16436c00aaabb3ec10c49ff4cc131c6aa9f4ca