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

Trivial merge