Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Feb 2011 14:12:29 +0000 (15:12 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Feb 2011 14:12:29 +0000 (15:12 +0100)

Trivial merge