From: Nick Coghlan <ncoghlan@gmail.com>
Date: Fri, 19 Oct 2012 13:40:21 +0000 (+1000)
Subject: Dummy merge from 3.2
X-Git-Tag: v3.3.1rc1~773
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=059e37f5996c12f8b2c53e9a82ed83e77451ef72;p=python

Dummy merge from 3.2
---

059e37f5996c12f8b2c53e9a82ed83e77451ef72