Merge branch 'bug_203_fix_wrong_networkstate'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:15:51 +0000 (07:15 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:15:51 +0000 (07:15 +0100)
commit786a5a906d13ec5832fbecf5c4fa5421f2cac790
treedad699d93fac8d8d0476f522a8d0d6b2035e2504
parent44985357544c5a3bf67a758c8612102ac59a74cc
parent075c89b1e624ce80fa02aa789a319d84cbe928b4
Merge branch 'bug_203_fix_wrong_networkstate'

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