Merge commit 'origin/bug_218_simplify_networkwizard'
authoracid-burn <acid-burn@opendreambox.org>
Mon, 8 Feb 2010 15:19:00 +0000 (16:19 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 8 Feb 2010 15:19:00 +0000 (16:19 +0100)

Trivial merge