From: Andrew Kuchling <amk@amk.ca>
Date: Fri, 21 Jun 2013 01:40:14 +0000 (-0400)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0a1~439
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29303d4ea5d393edb930e94096bb5ae1d204e618;p=python

Merge from 3.3
---

29303d4ea5d393edb930e94096bb5ae1d204e618