From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 22 Sep 2013 09:38:44 +0000 (+1000)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0a3~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df4cb129e4a449ca0b6556dcc9437a35bef5723d;p=python

Merge from 3.3
---

df4cb129e4a449ca0b6556dcc9437a35bef5723d