From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 6 May 2013 11:13:50 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.4.0a1~790
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3a0da24f3319a16de0bf78e749a30087880b57d;p=python

Merge
---

f3a0da24f3319a16de0bf78e749a30087880b57d