From: Andrew Kuchling <amk@amk.ca>
Date: Sun, 16 Jun 2013 17:02:55 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~474^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f567727abcba9d3b56fd2d0254050eff23535d1a;p=python

Merge with 3.3
---

f567727abcba9d3b56fd2d0254050eff23535d1a