From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 12 Oct 2012 16:02:06 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.4.0a1~2264
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78ef0885b4f45a66ad986ef121cb11f59e59aed1;p=python

merge 3.2
---

78ef0885b4f45a66ad986ef121cb11f59e59aed1