Merge branch 'bug_718_timer_sanitycheck_robustness' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 10 Mar 2011 12:18:18 +0000 (13:18 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 10 Mar 2011 12:18:18 +0000 (13:18 +0100)

Trivial merge