Merge branch 'bug_612_fix_timeshift_stop' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 15:58:33 +0000 (16:58 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 15:58:33 +0000 (16:58 +0100)

Trivial merge