Merge branch 'bug_587_new_internally_connectable_and_unsupported_tuner_management...
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Mon, 11 Oct 2010 10:37:49 +0000 (12:37 +0200)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Mon, 11 Oct 2010 10:37:49 +0000 (12:37 +0200)
commit0951e9fb3386f8f941a7756910ff7162ebb98a4a
treec4cf3158bcdfb42abb6dfa8bc900808a906dfc16
parentfb9f45f86fe3c793acf781ffbdee18c24857ffa7
parentd21824019fe93603f1c05c7263ef7570aa60e135
Merge branch 'bug_587_new_internally_connectable_and_unsupported_tuner_management' into experimental

Conflicts:
lib/python/Components/NimManager.py
lib/python/Components/NimManager.py