Merge branch 'bug_245_record_playback_fixes'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:02:20 +0000 (16:02 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:02:20 +0000 (16:02 +0100)
1  2 
lib/dvb/tstools.cpp
lib/python/Screens/InfoBarGenerics.py

Simple merge
Simple merge