Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
authorFelix Domke <tmbinc@elitedvb.net>
Fri, 13 Feb 2009 02:47:44 +0000 (03:47 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Fri, 13 Feb 2009 02:47:44 +0000 (03:47 +0100)
commita4b8eb676ba549ebe8cf347f15888e51d8914789
treef88416c61e96ec26675c8817a6961a74207f0f7b
parentdce87891f204f8e1f7151c4a3ba00b9dd048e795
parentc46312d7f5ce4113ece4c33595b7192eccadcb1d
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

Conflicts:

lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/InfoBarGenerics.py