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

[benjamin.peterson]

http://hg.python.org/cpython/rev/4061fedf5429
changeset:   71702:4061fedf5429
parent:      71701:bbeda42ea6a8
parent:      71698:b2dc821058fe
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Aug 02 13:06:19 2011 -0500
summary:
  merge heads

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