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)
commitb1b6f099a80c117847b55f2ca592a244033dbb10
treed9da58a5bd969ce0d8ee07b2e6c3acf24400bd85
parentee4870b6452d5d100bd77fe52a0306a344826311
parentb6bf9802c72dfa28dc2fc25014792d9771e49366
Merge commit 'origin/bug_218_simplify_networkwizard'