From: Richard Oudkerk <shibturn@gmail.com>
Date: Sun, 29 Sep 2013 16:33:04 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a4~311^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=085ab4a553e1ff3f32a091850bd8acb02eee63ec;p=python

Merge.
---

085ab4a553e1ff3f32a091850bd8acb02eee63ec