Merge remote branch 'origin/bug_587_new_internally_connectable_and_unsupported_tuner_...
authorghost <andreas.monzner@multimedia-labs.de>
Sun, 10 Oct 2010 10:50:31 +0000 (12:50 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Sun, 10 Oct 2010 10:50:31 +0000 (12:50 +0200)
1  2 
data/skin_default.xml
lib/python/Components/NimManager.py

Simple merge
Simple merge