Merge branch 'bug_202_networkconfig_cleanup'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:10:39 +0000 (07:10 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:10:39 +0000 (07:10 +0100)
commit44985357544c5a3bf67a758c8612102ac59a74cc
tree31f13bfac0ceb98ec6d398ddf7cad6cb1deb35f9
parent0cf3bc28d59e7bfb8519839a8e9c36a87ea382c8
parentf389b2688c769776b706f2fec59c3bcc1425cbc0
Merge branch 'bug_202_networkconfig_cleanup'

Conflicts:
lib/python/Screens/NetworkSetup.py