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

[brian.curtin]

http://hg.python.org/cpython/rev/b166c972cb5e
changeset:   69261:b166c972cb5e
branch:      3.2
parent:      69258:68ef2bf1aa99
parent:      69260:33b54387cc2a
user:        Brian Curtin <brian at python.org>
date:        Mon Apr 11 18:36:25 2011 -0500
summary:
  Dummy merge

files:



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