Blocked revisions 63430 via svnmerge

........
  r63430 | fred.drake | 2008-05-17 16:30:04 -0400 (Sat, 17 May 2008) | 3 lines

  rename HTMLParser to html.parser, htmlentitydefs to html.entities
  (http://bugs.python.org/issue2882)
........