Merge remote branch 'origin/bug_347_adenin_unicable_xml'

diff --cc lib/dvb/frontend.cpp
Simple merge

diff --cc lib/dvb/idvb.h
Simple merge

diff --cc lib/python/Components/NimManager.py
Simple merge

diff --cc lib/python/Components/config.py
Simple merge

diff --cc lib/python/Screens/Satconfig.py
Simple merge