From: Philip Jenvey <pjenvey@underboss.org>
Date: Tue, 13 Nov 2012 20:27:56 +0000 (-0800)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~638
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=000bd4254fa23a9ea3dee356ac747f48c3b0e74f;p=python

merge 3.2
---

000bd4254fa23a9ea3dee356ac747f48c3b0e74f