From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 2 Jan 2013 15:37:33 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~164^2~119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=140794d6e79c60642c3ff2634a233e55cd3faeea;p=python

merge heads
---

140794d6e79c60642c3ff2634a233e55cd3faeea