From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 18 Feb 2012 00:58:41 +0000 (-0500)
Subject: Merge with 3.2 closes 14023
X-Git-Tag: v3.3.0a1~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93abdd1ab80b014a32a97342c263cf6d623d4ce6;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2 closes 14023
---

93abdd1ab80b014a32a97342c263cf6d623d4ce6