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

[charles-francois.natali]

http://hg.python.org/cpython/rev/0943778ee188
changeset:   87984:0943778ee188
parent:      87982:fff1854f4423
parent:      87975:c42647d76bd1
user:        Charles-François Natali <cf.natali at gmail.com>
date:        Mon Dec 16 13:49:30 2013 +0100
summary:
  Merge.

files:



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