From: Mladen Horvat <acid-burn@opendreambox.org>
Date: Wed, 9 Dec 2009 20:37:50 +0000 (+0100)
Subject: Merge commit 'origin/bug_138_networkwizard_fixes' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~157
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/4588321e0ee8151324a5a183ff2ced5ea80629cf

Merge commit 'origin/bug_138_networkwizard_fixes' into experimental

Conflicts:
	lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
---

4588321e0ee8151324a5a183ff2ced5ea80629cf