Merged revisions 84735 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84735 | benjamin.peterson | 2010-09-12 08:55:02 -0500 (Sun, 12 Sep 2010) | 1 line

  reenable test_nis on solaris #3402
........

Lib/test/test_nis.py

@@ -4,7 +4,6 @@ import unittest
 # Skip test if nis module does not exist.
 nis = support.import_module('nis')
 
-raise unittest.SkipTest("test_nis hangs on Solaris")
 
 class NisTests(unittest.TestCase):
     def test_maps(self):