From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Jan 2012 21:43:54 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v2.7.3rc1~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a15103d793141e22489a3de612f44f6dbb63d29;p=python

merge heads
---

0a15103d793141e22489a3de612f44f6dbb63d29