merge heads

This commit is contained in:
Benjamin Peterson 2011-08-02 13:06:19 -05:00
commit 9c46480063

View file

@ -2329,7 +2329,7 @@ An example of dictionary view usage::
>>> keys & {'eggs', 'bacon', 'salad'}
{'bacon'}
>>> keys ^ {'sausage', 'juice'}
{'juice', 'eggs', 'bacon', 'spam'}
{'juice', 'sausage', 'bacon', 'spam'}
.. _typememoryview: