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

[antoine.pitrou]

http://hg.python.org/cpython/rev/c397323f5fdd
changeset:   68779:c397323f5fdd
parent:      68777:34db881edb4d
parent:      68778:c60271bb1fb1
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Mon Mar 21 00:29:02 2011 +0100
summary:
  Merge

files:
  


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