Merge branch 'bug_587_new_internally_connectable_and_unsupported_tuner_management...
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Wed, 6 Oct 2010 07:00:42 +0000 (09:00 +0200)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Wed, 6 Oct 2010 07:00:42 +0000 (09:00 +0200)
commit0edde94c71828b4cbb95bbfb7011b6b966562742
tree6db16a96def5c5d0ebc2d916dba5030c4e49fe0e
parent0ffddc5916909206895777778b1ac99073ae1ca2
parent006e3497641164df7a413c8730d9b8914d67e2d8
Merge branch 'bug_587_new_internally_connectable_and_unsupported_tuner_management' into bug_593_i2c_device_from_file

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