From: Nick Coghlan <ncoghlan@gmail.com>
Date: Thu, 7 Jun 2012 12:42:29 +0000 (+1000)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0b1~262
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbc203e655e0c1184d67f02864353de5b01c7bc0;p=python

Merge from 3.2
---

cbc203e655e0c1184d67f02864353de5b01c7bc0