From: Richard Oudkerk <shibturn@gmail.com>
Date: Fri, 17 Aug 2012 14:05:09 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0rc1~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b391b24efe9d12e44e237064ea26be43d6a6e9a2;p=python

Merge
---

b391b24efe9d12e44e237064ea26be43d6a6e9a2