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

Merge from 3.3
---

ac6e57869136e39b0141ce0722099f7fe1476b94