From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 20 Oct 2012 01:45:02 +0000 (+1000)
Subject: Dummy merge from 3.2
X-Git-Tag: v3.3.1rc1~770
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=903c3167cf03c87f0cd4a64225e8067f3168dc8f;p=python

Dummy merge from 3.2
---

903c3167cf03c87f0cd4a64225e8067f3168dc8f