Index: ez_setup.py
===================================================================
--- ez_setup.py	(revision 66490)
+++ ez_setup.py	(working copy)
@@ -51,7 +51,10 @@
 
 def _validate_md5(egg_name, data):
     if egg_name in md5_data:
-        from md5 import md5
+        try:
+            from hashlib import md5
+        except ImportError:
+            from md5 import md5
         digest = md5(data).hexdigest()
         if digest != md5_data[egg_name]:
             print >>sys.stderr, (
@@ -230,7 +233,10 @@
     """Update our built-in md5 registry"""
 
     import re
-    from md5 import md5
+    try:
+        from hashlib import md5
+    except ImportError:
+        from md5 import md5
 
     for name in filenames:
         base = os.path.basename(name)