Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...

diff --combined configure.ac
index aac8f11,838f410..31fad1b
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -193,8 -193,6 +193,8 @@@ lib/python/Plugins/Extensions/DLNAServe
  lib/python/Plugins/Extensions/DLNAServer/meta/Makefile
  lib/python/Plugins/Extensions/DLNABrowser/Makefile
  lib/python/Plugins/Extensions/DLNABrowser/meta/Makefile
 +lib/python/Plugins/Extensions/HbbTV/Makefile
 +lib/python/Plugins/Extensions/HbbTV/meta/Makefile
  lib/python/Plugins/SystemPlugins/CleanupWizard/Makefile
  lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile
  lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile
@@@ -267,6 -265,9 +267,9 @@@ lib/python/Plugins/SystemPlugins/Wirele
  lib/python/Plugins/SystemPlugins/WirelessAccessPoint/meta/Makefile
  lib/python/Plugins/SystemPlugins/ZappingModeSelection/Makefile
  lib/python/Plugins/SystemPlugins/ZappingModeSelection/meta/Makefile
+ lib/python/Plugins/SystemPlugins/DeviceManager/Makefile
+ lib/python/Plugins/SystemPlugins/DeviceManager/meta/Makefile
+ lib/python/Plugins/SystemPlugins/DeviceManager/locale/Makefile
  lib/python/Tools/Makefile
  lib/service/Makefile
  lib/components/Makefile