Merge branch 'bug_718_timer_sanitycheck_robustness'
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 14 Mar 2011 09:36:47 +0000 (10:36 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 14 Mar 2011 09:36:47 +0000 (10:36 +0100)

Trivial merge