[Python-checkins] cpython (merge default -> 3.3): merge 3.3 (#18470)

[benjamin.peterson]

http://hg.python.org/cpython/rev/8889c9b5dd3a
changeset:   84654:8889c9b5dd3a
branch:      3.3
parent:      84653:c3a510b22218
parent:      84652:8a078bf3cf14
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jul 15 19:15:49 2013 -0700
summary:
  merge 3.3 (#18470)

files:



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