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

[antoine.pitrou]

http://hg.python.org/cpython/rev/f417aff64dcc
changeset:   75306:f417aff64dcc
parent:      75305:dc0682e0b0cf
parent:      75300:17562834a246
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Mon Feb 27 01:01:58 2012 +0100
summary:
  Merge

files:



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