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)
commit330d89bcb3e580f8b4ec4aaabbc2e8d7a50c5f6f
tree5f72866a36c5dd92327496311edd274ac22e517b
parent91325961f07c9285bc778c1b413c1714def4b47a
parentd6e258a761abb1074a1157d17b9c42b7f28959ce
Merge branch 'bug_138_networkwizard_fixes'

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