From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 27 Oct 2011 12:22:27 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.3rc1~370
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85c46b163561368fb16451cbaa2c899c8870d3a7;p=python

merge heads
---

85c46b163561368fb16451cbaa2c899c8870d3a7