Merge branch 'bug_635_timer_sanity_check_speedup' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 21 Dec 2010 09:41:59 +0000 (10:41 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 21 Dec 2010 09:41:59 +0000 (10:41 +0100)

Trivial merge