From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 28 May 2012 12:36:07 +0000 (+1000)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a4~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab45e689be9e954de37fcb18d584fa09a19111f3;p=python

Merge from 3.2
---

ab45e689be9e954de37fcb18d584fa09a19111f3