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

[ross.lagerwall]

http://hg.python.org/cpython/rev/a49bda5ff3d5
changeset:   68441:a49bda5ff3d5
parent:      68438:1cd2082ade48
parent:      68440:3bf07c74aef1
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Mon Mar 14 10:42:24 2011 +0200
summary:
  Merge with 3.2

files:
  Doc/library/multiprocessing.rst

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -875,7 +875,7 @@
 
 .. class:: Semaphore([value])
 
-   A bounded semaphore object: a clone of :class:`threading.Semaphore`.
+   A semaphore object: a clone of :class:`threading.Semaphore`.
 
 .. note::
 

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