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

[benjamin.peterson]

http://hg.python.org/cpython/rev/a69ef22b60e3
changeset:   68326:a69ef22b60e3
parent:      68325:c43d685e1533
parent:      68322:8947c47a9fef
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Mar 07 22:52:41 2011 -0600
summary:
  merge heads

files:
  


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