From: Nick Coghlan <ncoghlan@gmail.com>
Date: Thu, 5 May 2011 14:03:49 +0000 (+1000)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~2399
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb395187d02b9f6a2a3114d9ffa3fa77faca5008;p=python

Merge from 3.2
---

cb395187d02b9f6a2a3114d9ffa3fa77faca5008