Merge branch 'master' of github.com:rg3/youtube-dl

diff --combined setup.py
index c59ab086f0f28937c9e57502a4a8d642edfd3d95,55fc1c839d38db3248d28fb97186ad21c785a880..1d2e71e15fb24d6ae5a79d8cee2ebfcbfad6c3fb
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -2,8 -2,6 +2,8 @@@
  # -*- coding: utf-8 -*-
  
  from __future__ import print_function
 +
 +from glob import glob
  import pkg_resources
  import sys
  
@@@ -25,9 -23,7 +25,9 @@@ py2exe_options = 
      "compressed": 1,
      "optimize": 2,
      "dist_dir": '.',
 -    "dll_excludes": ['w9xpopen.exe']
 +    "dll_excludes": ['w9xpopen.exe'],
 +    "includes": [m.replace('\\', '.').replace('/', '.')[:-3]
 +                 for m in glob('youtube_dl/*/*.py')]
  }
  py2exe_console = [{
      "script": "./youtube_dl/__main__.py",
@@@ -61,7 -57,7 +61,7 @@@ setup
      author = 'Ricardo Garcia',
      maintainer = 'Philipp Hagemeister',
      maintainer_email = 'phihag@phihag.de',
-     packages = ['youtube_dl'],
+     packages = ['youtube_dl', 'youtube_dl.extractor'],
  
      # Provokes warning on most systems (why?!)
      #test_suite = 'nose.collector',