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

[sandro.tosi]

http://hg.python.org/cpython/rev/f3e5545cf40c
changeset:   78528:f3e5545cf40c
parent:      78525:90a559ce9151
parent:      78526:e87fb826c092
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sun Aug 12 15:12:32 2012 +0200
summary:
  merge with 3.2

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


diff --git a/Doc/library/random.rst b/Doc/library/random.rst
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -80,7 +80,7 @@
 
    *state* should have been obtained from a previous call to :func:`getstate`, and
    :func:`setstate` restores the internal state of the generator to what it was at
-   the time :func:`setstate` was called.
+   the time :func:`getstate` was called.
 
 
 .. function:: getrandbits(k)

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