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

author Felix Domke <tmbinc@elitedvb.net>

Fri, 13 Feb 2009 13:47:32 +0000 (14:47 +0100)

committer Felix Domke <tmbinc@elitedvb.net>

Fri, 13 Feb 2009 13:47:32 +0000 (14:47 +0100)
author Felix Domke <tmbinc@elitedvb.net>
Fri, 13 Feb 2009 13:47:32 +0000 (14:47 +0100)
committer Felix Domke <tmbinc@elitedvb.net>
Fri, 13 Feb 2009 13:47:32 +0000 (14:47 +0100)
diff --cc lib/python/Components/Converter/StringList.py
Simple merge
diff --cc lib/service/servicedvb.cpp
Simple merge
author	Felix Domke <tmbinc@elitedvb.net>
	Fri, 13 Feb 2009 13:47:32 +0000 (14:47 +0100)
committer	Felix Domke <tmbinc@elitedvb.net>
	Fri, 13 Feb 2009 13:47:32 +0000 (14:47 +0100)
		1	2
lib/python/Components/Converter/StringList.py	patch \|	diff1 \|	diff2 \|	blob \| history
lib/service/servicedvb.cpp	patch \|	diff1 \|	diff2 \|	blob \| history