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

[antoine.pitrou]

http://hg.python.org/cpython/rev/e6bac47a2cd9
changeset:   77779:e6bac47a2cd9
parent:      77777:6dc9472346de
parent:      77778:40cc55770988
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Mon Jun 25 18:09:07 2012 +0200
summary:
  Merge

files:



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