From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Wed, 17 Oct 2012 14:16:19 +0000 (+0300)
Subject: Merge issue #9583: Document startup option/environment interaction.
X-Git-Tag: v3.3.1rc1~782^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2365f41a0e576ffdc880c9899d0cc5c0eaef97bc;p=thirdparty%2FPython%2Fcpython.git

Merge issue #9583: Document startup option/environment interaction.

Patch by Todd Rovito.
---

2365f41a0e576ffdc880c9899d0cc5c0eaef97bc