Merged revisions 77129,77132 via svnmerge from

Merged revisions 77129,77132 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77129 | benjamin.peterson | 2009-12-29 21:02:03 -0600 (Tue, 29 Dec 2009) | 9 lines

  Merged revisions 77128 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77128 | benjamin.peterson | 2009-12-29 20:58:50 -0600 (Tue, 29 Dec 2009) | 1 line

    only build the nis module when the headers are found #7589
  ........
................
  r77132 | benjamin.peterson | 2009-12-29 21:03:54 -0600 (Tue, 29 Dec 2009) | 9 lines

  Merged revisions 77130 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77130 | benjamin.peterson | 2009-12-29 21:02:34 -0600 (Tue, 29 Dec 2009) | 1 line

    wrap long line
  ........
................