From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 5 Jun 2013 18:36:50 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~561
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=448f1a86ef13fba826bac70f81b265dc50e333ac;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

448f1a86ef13fba826bac70f81b265dc50e333ac