Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Thu, 10 Dec 2009 10:13:30 +0000 (11:13 +0100)
committerMladen Horvat <acid-burn@opendreambox.org>
Thu, 10 Dec 2009 10:13:30 +0000 (11:13 +0100)
commitbeee99ffe9fc10811f2d84b531081ef81d4b6518
tree89bc230c547e5312091b0e8e134a2f6c020f398a
parent4588321e0ee8151324a5a183ff2ced5ea80629cf
parentf741c4cc282f2f99b86e6ec305604f27216087ba
Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental

Conflicts:
lib/python/Screens/NetworkSetup.py