From: acid-burn <acid-burn@opendreambox.org>
Date: Wed, 23 Dec 2009 06:10:39 +0000 (+0100)
Subject: Merge branch 'bug_202_networkconfig_cleanup'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=44985357544c5a3bf67a758c8612102ac59a74cc

Merge branch 'bug_202_networkconfig_cleanup'

Conflicts:
	lib/python/Screens/NetworkSetup.py
---

44985357544c5a3bf67a758c8612102ac59a74cc