Merge branch 'bug_263_fix_timeshift_live_transition'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:09:06 +0000 (16:09 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:09:06 +0000 (16:09 +0100)

Trivial merge