Merged revisions 72183-72184 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72183 | georg.brandl | 2009-05-01 14:28:35 -0700 (Fri, 01 May 2009) | 2 lines

  Review ipaddr docs and add them in the TOC under "Internet protocols".
........
  r72184 | georg.brandl | 2009-05-01 14:30:25 -0700 (Fri, 01 May 2009) | 1 line

  Fix directive name.
........