From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 13 Aug 2013 23:51:29 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a2~228
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b31e3f7fb8a8c774b9b7a8fe414ba19639484a3b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

b31e3f7fb8a8c774b9b7a8fe414ba19639484a3b