Merge branch 'bug_263_fix_timeshift_live_transition' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Dec 2009 18:55:31 +0000 (19:55 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Dec 2009 18:55:31 +0000 (19:55 +0100)

Trivial merge