From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 15 Jul 2011 19:11:23 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.2.2rc1~110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58059197cc2a8c6f1fd3fb0e95614def14d0aaff;p=python

merge heads
---

58059197cc2a8c6f1fd3fb0e95614def14d0aaff