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

Merge.
---

0471ac3d80cb9acdfc82b053145477f5f1e7c6f1