Merge branch 'vuplus_experimental' of 192.168.102.66:/opt/repository/enigma2 into...

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

diff --cc configure.ac
index fbf5797,f4068cb..39226dc
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -213,6 -211,10 +213,8 @@@ lib/python/Plugins/SystemPlugins/Manual
  lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/Makefile
  lib/python/Plugins/SystemPlugins/Blindscan/Makefile
  lib/python/Plugins/SystemPlugins/Blindscan/meta/Makefile
 -lib/python/Plugins/SystemPlugins/WebBrowser/Makefile
 -lib/python/Plugins/SystemPlugins/WebBrowser/meta/Makefile
+ lib/python/Plugins/SystemPlugins/RemoteControlCode/Makefile
+ lib/python/Plugins/SystemPlugins/RemoteControlCode/meta/Makefile
  lib/python/Tools/Makefile
  lib/service/Makefile
  lib/components/Makefile

diff --cc lib/python/Plugins/SystemPlugins/Makefile.am
index cf52544,0caab12..c3eda28
--- 1/lib/python/Plugins/SystemPlugins/Makefile.am
--- 2/lib/python/Plugins/SystemPlugins/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Makefile.am
@@@ -5,7 -5,7 +5,7 @@@ SUBDIRS = SoftwareManager Frontprocesso
        DefaultServicesScanner NFIFlash DiseqcTester CommonInterfaceAssignment \
        CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard \
        TempFanControl FactoryTest Fancontrol FPGAUpgrade WirelessLanSetup ManualFancontrol \
-       Blindscan 
 -      Blindscan WebBrowser RemoteControlCode 
++      Blindscan RemoteControlCode 
  
  install_PYTHON =      \
        __init__.py