Merged revisions 86601,86605 via svnmerge from

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

........
  r86601 | eric.araujo | 2010-11-20 20:35:27 +0100 (sam., 20 nov. 2010) | 2 lines

  Fix two NameErrors in distutils (#10407)
........
  r86605 | eric.araujo | 2010-11-20 20:37:28 +0100 (sam., 20 nov. 2010) | 2 lines

  Add entry for r86601
........

Lib/distutils/dir_util.py

@@ -5,6 +5,7 @@ Utility functions for manipulating directories and directory trees."""
 __revision__ = "$Id$"
 
 import os, sys
+import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 

Lib/distutils/tests/test_sysconfig.py

@@ -1,5 +1,6 @@
 """Tests for distutils.sysconfig."""
 import os
+import shutil
 import test
 import unittest
 

Misc/NEWS

@@ -16,6 +16,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #10407: Fix two NameErrors in distutils.
+
 - Issue #10198: fix duplicate header written to wave files when writeframes()
   is called without data.