From: Richard Oudkerk <shibturn@gmail.com>
Date: Fri, 19 Jul 2013 21:54:37 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e410f267f1c110d4e9738a0f36e2e27c0365278f;p=python

Merge.
---

e410f267f1c110d4e9738a0f36e2e27c0365278f