From: acid-burn <acid-burn@opendreambox.org>
Date: Tue, 5 Oct 2010 10:57:56 +0000 (+0200)
Subject: Merge commit 'origin/bug_558_wlanfixes'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=b6da0afe0cd5cf7ba08427fd1b8e2fe9bb270901

Merge commit 'origin/bug_558_wlanfixes'

Conflicts:
	lib/python/Components/Network.py
---

b6da0afe0cd5cf7ba08427fd1b8e2fe9bb270901