Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental

Conflicts:
	lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
	lib/python/Screens/NetworkSetup.py

diff --cc lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index a78857a674632ac0869d76e8ed71ee0763374072,c8568b9869e841926640d98da70653144e888b8d..6bfaec528afed51073c9a388a51586256f449426
--- 1/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@@ -262,8 -262,6 +262,11 @@@ class WlanScan(Screen)
                self.updateAPList()
  
        def buildEntryComponent(self, essid, bssid, encrypted, iface, maxrate, signal):
++<<<<<<< HEAD:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
 +              print "buildEntryComponent",essid
 +              print "buildEntryComponent",bssid
++=======
++>>>>>>> origin/bug_203_fix_wrong_networkstate:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
                divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png"))
                encryption = encrypted and _("Yes") or _("No")
                if bssid == 'hidden...':