Merge branch 'bug_411_timeshift_disable_without_live' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:20:54 +0000 (14:20 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:20:54 +0000 (14:20 +0100)

Trivial merge