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

[antoine.pitrou]

http://hg.python.org/cpython/rev/547897c3571a
changeset:   71379:547897c3571a
parent:      71374:dfaa3a149a92
parent:      71378:362556f980ac
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Jul 16 23:52:42 2011 +0200
summary:
  Dummy merge

files:



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