From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 24 Oct 2011 12:51:46 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.3rc1~381^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22dabb6ffa5860ee08138c2f67b0406d566df5f4;p=python

merge heads
---

22dabb6ffa5860ee08138c2f67b0406d566df5f4