From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 24 Jun 2013 17:13:54 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~404
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93b736ee15456a81ed6b842109153fa8beb988b9;p=python

Merge.
---

93b736ee15456a81ed6b842109153fa8beb988b9