From: Barry Warsaw <barry@python.org>
Date: Fri, 22 Nov 2013 20:31:49 +0000 (-0500)
Subject: trunk merge
X-Git-Tag: v3.4.0b1~102^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0d641abf2784360facaebadd2418d1498c380f9;p=thirdparty%2FPython%2Fcpython.git

trunk merge
---

e0d641abf2784360facaebadd2418d1498c380f9