Merge branch 'bug_411_timeshift_disable_without_live' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 22 Jan 2010 14:07:57 +0000 (15:07 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 22 Jan 2010 14:07:57 +0000 (15:07 +0100)

Trivial merge