From: Mladen Horvat <acid-burn@opendreambox.org>
Date: Thu, 10 Dec 2009 10:13:30 +0000 (+0100)
Subject: Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~156
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/beee99ffe9fc10811f2d84b531081ef81d4b6518

Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental

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

beee99ffe9fc10811f2d84b531081ef81d4b6518