Merge branch 'bug_138_networkwizard_fixes'

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

diff --cc lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
index b158cde1e4a51269fd1e84668ffcb8497e6fd03c,ef90d96d53a720967097f9d21a368a49fab8b46c..75ca390be9a8acb65c4630e27cb7d6a8651efa07
--- 1/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
--- 2/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
@@@ -7,10 -6,9 +6,10 @@@ from Components.Pixmap import Pixmap, M
  from Components.Sources.Boolean import Boolean
  from Components.config import config, ConfigBoolean, configfile, ConfigYesNo, NoSave, ConfigSubsection, ConfigText, getConfigListEntry, ConfigSelection, ConfigPassword
  from Components.Network import iNetwork
- 
  from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
+ from enigma import eTimer
  
 +
  config.misc.firstrun = ConfigBoolean(default = True)
  list = []
  list.append("WEP")