Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 15 Dec 2009 18:29:43 +0000 (19:29 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 15 Dec 2009 18:29:43 +0000 (19:29 +0100)
commitdefadb893d6897935165b63a9de09b95f43dfcc1
treee24a3faa54908e04170f9c393a2c73cdd0e24de9
parent46b2ddde6868639c2c437f1bed6d6db27a71038d
parentbfd5fa5d07a4c26aeb028a68818a9e2300c9dc6f
Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental

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