Merge remote branch 'remotes/origin/bug_587_new_internally_connectable_and_unsupporte...
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 14 Oct 2010 11:21:33 +0000 (13:21 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 14 Oct 2010 11:21:33 +0000 (13:21 +0200)
1  2 
data/skin_default.xml
lib/dvb/frontend.cpp
lib/python/Components/NimManager.py

Simple merge
Simple merge
Simple merge