From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 13 Feb 2009 02:47:44 +0000 (+0100)
Subject: Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
X-Git-Tag: 2.6.0~350^2~10
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/a4b8eb676ba549ebe8cf347f15888e51d8914789

Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

Conflicts:

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

a4b8eb676ba549ebe8cf347f15888e51d8914789