From: Richard Oudkerk <shibturn@gmail.com>
Date: Wed, 17 Apr 2013 20:27:17 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~896
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e84a51c38edc35e4c1e1df6b28b1e3be95ba8d00;p=python

Merge.
---

e84a51c38edc35e4c1e1df6b28b1e3be95ba8d00