Merge commit 'origin/bug_112_enable_extensions_manager' into experimental

Conflicts:
	lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py

diff --combined lib/python/Screens/TimerEntry.py
index 42a3195c04be15dbb54f0b363fe7cb30d3244db5,b231b568d7ceee54119f42c8a09293546c0caa1f..d7ba73d7dbd50375a44974801b4a18734b47ce39
--- 1/lib/python/Screens/TimerEntry.py
--- 2/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@@ -8,8 -8,8 +8,9 @@@ from Components.MenuList import MenuLis
  from Components.Button import Button
  from Components.Label import Label
  from Components.Pixmap import Pixmap
+ from Components.SystemInfo import SystemInfo
  from Components.UsageConfig import defaultMoviePath
 +from Components.SystemInfo import SystemInfo
  from Screens.MovieSelection import getPreferredTagEditor
  from Screens.LocationBox import MovieLocationBox
  from Screens.ChoiceBox import ChoiceBox