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

[benjamin.peterson]

http://hg.python.org/cpython/rev/37ed85008f51
changeset:   88458:37ed85008f51
parent:      88457:ead74e54d68f
parent:      88456:7f176a45211f
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jan 13 23:14:58 2014 -0500
summary:
  merge 3.3 (#20246)

files:



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