From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Wed, 28 Nov 2012 10:46:25 +0000 (-0800)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~1941
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=164f8f1336e21fdb31877df9dea79b75deefccc8;p=python

Merge heads.
---

164f8f1336e21fdb31877df9dea79b75deefccc8