From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 11 Apr 2012 20:10:07 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~912
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a82f3edc1358796b4012f38532a13929917ddd5b;p=python

merge heads
---

a82f3edc1358796b4012f38532a13929917ddd5b