Merge remote-tracking branch 'remotes/origin/bug_739_fix_CT_tuner_timer_bug'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 3 May 2011 09:41:36 +0000 (11:41 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 3 May 2011 09:41:36 +0000 (11:41 +0200)

Trivial merge