Merge commit 'origin/bug_558_wlanfixes'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 10:57:56 +0000 (12:57 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 10:57:56 +0000 (12:57 +0200)
commitb6da0afe0cd5cf7ba08427fd1b8e2fe9bb270901
tree5d6fa8fb417a3ec0c90a6a1f068ef883f630495c
parente2be31452f7c2d90fa7008583f36d6a6583cc83a
parent996081f3ac0b17e0609fb74b11db49112eeec43e
Merge commit 'origin/bug_558_wlanfixes'

Conflicts:
lib/python/Components/Network.py