From: Andrew Kuchling <amk@amk.ca>
Date: Sun, 16 Feb 2014 16:15:13 +0000 (-0500)
Subject: Merge from 3.3
X-Git-Tag: v3.4.1rc1~233^2~316
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87a113b807b308215957f127f3696dca58c08253;p=python

Merge from 3.3
---

87a113b807b308215957f127f3696dca58c08253