Merge commit 'origin/bug_112_enable_extensions_manager' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Mon, 28 Dec 2009 21:18:40 +0000 (22:18 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 28 Dec 2009 21:18:40 +0000 (22:18 +0100)
commita7ed9db9532b7ac58dc3b923c0e3f9ee1789ddeb
treee9c99d880022a9f41f93a1ee76b45a4f13200ac2
parenta285571e31b3b1a99764a674319621f0298833c2
parent018534fa7bf9be0885b2ffc753d8d6fc5b56143c
Merge commit 'origin/bug_112_enable_extensions_manager' into experimental

Conflicts:
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
lib/python/Screens/TimerEntry.py