Merge branch 'fantempplugin' into experimental

diff --combined configure.ac
index 1bda10ea758a0e3b2b0d31f8bd628c4745f282d7,188010022f10f5c73c5f6a81793c4e94cf23a0b4..aa2fa3e3a53a7367dcdf9536d9be0da7ee479150
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -155,6 -155,7 +155,7 @@@ lib/python/Plugins/SystemPlugins/Frontp
  lib/python/Plugins/SystemPlugins/Hotplug/Makefile
  lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile
  lib/python/Plugins/SystemPlugins/Makefile
+ lib/python/Plugins/SystemPlugins/TempFanControl/Makefile
  lib/python/Plugins/SystemPlugins/NetworkWizard/Makefile
  lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile
  lib/python/Plugins/SystemPlugins/NFIFlash/Makefile
@@@ -176,7 -177,6 +177,7 @@@ lib/python/Plugins/SystemPlugins/VideoT
  lib/python/Plugins/SystemPlugins/Videomode/Makefile
  lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile
  lib/python/Plugins/SystemPlugins/WirelessLan/Makefile
 +lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile
  lib/python/Tools/Makefile
  lib/service/Makefile
  lib/components/Makefile