From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 24 Jun 2013 19:39:28 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~403
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d89ae64b90b3b942b647292fdd2fc5776c4f525;p=python

Merge.
---

9d89ae64b90b3b942b647292fdd2fc5776c4f525