From: Philip Jenvey <pjenvey@underboss.org>
Date: Sat, 27 Oct 2012 00:05:55 +0000 (-0700)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~2163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16bb5450d6b68514039e4c5fe835482aced38b73;p=python

merge with 3.3
---

16bb5450d6b68514039e4c5fe835482aced38b73