Merge branch 'master' into rtmpdump

Conflicts:
	youtube_dl/FileDownloader.py

Merge

1 files changed, 1 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index f14f96377..aa7cfca08 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,7 @@ try:
     setuptools_available = True
 except ImportError:
     from distutils.core import setup
+    setuptools_available = False
 
 try:
     # This will create an exe that needs Microsoft Visual C++ 2008