[Python-checkins] cpython (merge 3.1 -> 3.2): Recording the merge.

[senthil.kumaran]

http://hg.python.org/cpython/rev/40f5355b6bf8
changeset:   68647:40f5355b6bf8
branch:      3.2
parent:      68644:db4967095f10
parent:      68646:2f222360a774
user:        Senthil Kumaran <orsenthil at gmail.com>
date:        Thu Mar 17 17:05:04 2011 +0800
summary:
  Recording the merge.

files:
  Lib/http/server.py


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