Merge branch 'bug_138_networkwizard_fixes'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:03:02 +0000 (07:03 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:03:02 +0000 (07:03 +0100)
Conflicts:
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py


No differences found