Merge branch 'WirelessLanSetup' into vuplus_experimental

Conflicts:
	configure.ac
	lib/python/Plugins/SystemPlugins/Makefile.am

diff --cc configure.ac
index 38b66d3,a0861ad..ccb1e00
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -203,8 -197,8 +203,10 @@@ lib/python/Plugins/SystemPlugins/Wirele
  lib/python/Plugins/SystemPlugins/FactoryTest/Makefile
  lib/python/Plugins/SystemPlugins/Fancontrol/Makefile
  lib/python/Plugins/SystemPlugins/Fancontrol/meta/Makefile
 +lib/python/Plugins/SystemPlugins/FPGAUpgrade/Makefile
 +lib/python/Plugins/SystemPlugins/FPGAUpgrade/meta/Makefile
+ lib/python/Plugins/SystemPlugins/WirelessLanSetup/Makefile
+ lib/python/Plugins/SystemPlugins/WirelessLanSetup/meta/Makefile
  lib/python/Tools/Makefile
  lib/service/Makefile
  lib/components/Makefile

diff --cc lib/python/Plugins/SystemPlugins/Makefile.am
index a2aa9e2,4dff0af..3594da2
--- 1/lib/python/Plugins/SystemPlugins/Makefile.am
--- 2/lib/python/Plugins/SystemPlugins/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Makefile.am
@@@ -4,7 -4,7 +4,7 @@@ SUBDIRS = SoftwareManager Frontprocesso
        SkinSelector SatelliteEquipmentControl Videomode VideoTune Hotplug \
        DefaultServicesScanner NFIFlash DiseqcTester CommonInterfaceAssignment \
        CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard \
-       TempFanControl FactoryTest Fancontrol FPGAUpgrade
 -      TempFanControl FactoryTest Fancontrol WirelessLanSetup
++      TempFanControl FactoryTest Fancontrol FPGAUpgrade WirelessLanSetup
  
  install_PYTHON =      \
        __init__.py