[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/e0df665b3100
changeset:   71884:e0df665b3100
parent:      71880:dcd2480b9a76
parent:      71883:16a02530fd81
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Tue Aug 16 20:03:50 2011 +0200
summary:
  merge with 3.2

files:
  Doc/license.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -875,7 +875,7 @@
 ----
 
 The :mod:`zlib` extension is built using an included copy of the zlib
-sources unless the zlib version found on the system is too old to be
+sources if the zlib version found on the system is too old to be
 used for the build::
 
   Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler

-- 
Repository URL: http://hg.python.org/cpython