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

[benjamin.peterson]

http://hg.python.org/cpython/rev/ecf17d9b0212
changeset:   71041:ecf17d9b0212
branch:      3.2
parent:      71034:de226a510b52
parent:      71040:633597815463
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Jun 28 21:49:40 2011 -0500
summary:
  merge 3.1

files:



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