From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 20 Oct 2012 10:13:42 +0000 (+1000)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0a1~2215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aaa28832fd5673e7b4b715c9d0ee65b4b2ac51ab;p=python

Merge from 3.3
---

aaa28832fd5673e7b4b715c9d0ee65b4b2ac51ab