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)
Conflicts:
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py


No differences found