From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Oct 2012 13:52:02 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.5~109^2~221^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba6a6cfbbc7359a871ef090f06ffeef1fb53e092;p=python

merge heads
---

ba6a6cfbbc7359a871ef090f06ffeef1fb53e092