python modules added to Python 2.7 path
Merge branch 'master' of github.com:E2OpenPlugins/e2openplugin-CrossEPG
CrossEPG_Main.setup: expect additional arguments

This function is exported as plugin entry point
so it should expect additional arguments being
passed.

Alternative solution might have been:

--- a/src/enigma2/python/plugin.py
+++ b/src/enigma2/python/plugin.py
@@ -5,7 +5,7 @@ from Plugins.Plugin import PluginDescriptor

 def setup(menuid, **kwargs):
        if menuid == "setup":
-               return [("CrossEPG", crossepg_main.setup, "crossepg", None)]
+               return [("CrossEPG", call_setup, "crossepg", None)]
        else:
                return []

Which avoids exporting a class member.
Merge remote-tracking branch 'CrossEPG/master'

* CrossEPG/master:
  CrossEPG_Main.setup: expect additional arguments
  python modules added to Python 2.7 path

Conflicts:
	Makefile
	src/enigma2/python/crossepg_main.py