From: acid-burn <acid-burn@opendreambox.org>
Date: Wed, 23 Dec 2009 06:03:02 +0000 (+0100)
Subject: Merge branch 'bug_138_networkwizard_fixes'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=330d89bcb3e580f8b4ec4aaabbc2e8d7a50c5f6f

Merge branch 'bug_138_networkwizard_fixes'

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

330d89bcb3e580f8b4ec4aaabbc2e8d7a50c5f6f
diff --cc lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
index b158cde,ef90d96..75ca390
--- a/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")