Merge commit 'origin/bug_218_simplify_networkwizard' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Fri, 29 Jan 2010 08:14:17 +0000 (09:14 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Fri, 29 Jan 2010 08:14:17 +0000 (09:14 +0100)
commit57ff47aa9d84ac5502a6d1bebcb10780997c3134
treedad2b6d8724a9cd8cc3fa5a20c7da854182da623
parent1ff71d24c512a57686d8cdbef41bc0112ca9be72
parentb6bf9802c72dfa28dc2fc25014792d9771e49366
Merge commit 'origin/bug_218_simplify_networkwizard' into experimental

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