From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 23 Mar 2013 20:35:38 +0000 (-0500)
Subject: merge 2.7.4 branch
X-Git-Tag: v2.7.5~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e48b2c29bdff8f5c5fd6d160db6fa4eb417c833c;p=python

merge 2.7.4 branch
---

e48b2c29bdff8f5c5fd6d160db6fa4eb417c833c