From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 12 Oct 2012 16:04:32 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=143d034ecd110f8543eba4ad76dfb6085cdaeb3d;p=python

merge 3.2
---

143d034ecd110f8543eba4ad76dfb6085cdaeb3d