[Python-checkins] (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/5973743a52a1
changeset:   68313:5973743a52a1
parent:      68311:6a7c312cc3ff
parent:      68312:fd0855e2c8cf
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Mar 06 18:10:58 2011 -0600
summary:
  merge 3.2

files:
  


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