From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 9 Jan 2012 23:33:27 +0000 (-0500)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a1~447
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d172343ad4d6b79ed076b294dfe963ebdab7c84;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2
---

8d172343ad4d6b79ed076b294dfe963ebdab7c84