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

[sandro.tosi]

http://hg.python.org/cpython/rev/b2dc821058fe
changeset:   71698:b2dc821058fe
parent:      71696:01192d30365a
parent:      71697:a70cdec027e7
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Tue Aug 02 18:43:49 2011 +0200
summary:
  #12665: merge with 3.2

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2329,7 +2329,7 @@
    >>> keys & {'eggs', 'bacon', 'salad'}
    {'bacon'}
    >>> keys ^ {'sausage', 'juice'}
-   {'juice', 'eggs', 'bacon', 'spam'}
+   {'juice', 'sausage', 'bacon', 'spam'}
 
 
 .. _typememoryview:

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