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

[benjamin.peterson]

http://hg.python.org/cpython/rev/1ab1365e6b7a
changeset:   70786:1ab1365e6b7a
branch:      3.2
parent:      70782:9be10dad0d51
parent:      70784:6f0bcfc17a9e
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jun 11 11:34:31 2011 -0500
summary:
  merge 3.1

files:



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