From: Nick Coghlan <ncoghlan@gmail.com>
Date: Fri, 19 Oct 2012 13:37:28 +0000 (+1000)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0a1~2220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=324c9faeb19da66c64727fedd7e8daced962fa7d;p=python

Merge from 3.3
---

324c9faeb19da66c64727fedd7e8daced962fa7d