Merge commit 'origin/master' into tmbinc/FixTimingBugs

diff --cc lib/base/filepush.cpp
Simple merge

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

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

diff --cc lib/python/Components/Converter/StringList.py
Simple merge

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

diff --cc lib/python/Components/Renderer/FrontpanelLed.py
index cd329b5,c008396..dcb9cd2
--- 1/lib/python/Components/Renderer/FrontpanelLed.py
--- 2/lib/python/Components/Renderer/FrontpanelLed.py
+++ b/lib/python/Components/Renderer/FrontpanelLed.py
@@@ -2,13 -2,9 +2,10 @@@ from Components.Element import Elemen
  
  # this is not a GUI renderer.
  class FrontpanelLed(Element):
-       def __init__(self):
-               Element.__init__(self)
- 
        def changed(self, *args, **kwargs):
 -              if self.source.value:
 +              if self.source.value or 1:
                        pattern = 0x55555555
 +                      pattern_4bit = 0x84fc8c04
                        speed = 20
                else:
                        pattern = 0

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

diff --cc lib/service/servicedvb.cpp
Simple merge