diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py
index e617589..6b57f79 100644
--- a/numpy/distutils/core.py
+++ b/numpy/distutils/core.py
@@ -2,7 +2,7 @@
 import sys
 from distutils.core import *
 
-if 'setuptools' in sys.modules:
+try:
     have_setuptools = True
     from setuptools import setup as old_setup
     # easy_install imports math, it may be picked up from cwd
@@ -12,7 +12,7 @@ if 'setuptools' in sys.modules:
         from setuptools.command import bdist_egg
     except ImportError:
         have_setuptools = False
-else:
+except:
     from distutils.core import setup as old_setup
     have_setuptools = False
 
diff --git a/numpy/distutils/core.pyc b/numpy/distutils/core.pyc
index 4b417b1..ff50fa5 100644
Binary files a/numpy/distutils/core.pyc and b/numpy/distutils/core.pyc differ
diff --git a/numpy/version.py b/numpy/version.py
index e932075..d79cba7 100644
--- a/numpy/version.py
+++ b/numpy/version.py
@@ -3,7 +3,7 @@
 short_version = '1.6.2'
 version = '1.6.2'
 full_version = '1.6.2'
-git_revision = 'ca07bce202ae26b6f0a73870eb2ef0b88e0210c5'
+git_revision = '5e93d3e280df98db0ef781ea8f3439604077829f'
 release = True
 
 if not release:
diff --git a/numpy/version.pyc b/numpy/version.pyc
index a647f9e..f2db7ab 100644
Binary files a/numpy/version.pyc and b/numpy/version.pyc differ