From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 22 Jan 2013 15:58:14 +0000 (+0000)
Subject: Merged doc update from 3.2.
X-Git-Tag: v3.3.1rc1~311
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3bdce8c914c38f985fc70589488d0d01019250b;p=thirdparty%2FPython%2Fcpython.git

Merged doc update from 3.2.
---

a3bdce8c914c38f985fc70589488d0d01019250b