Merge branch 'bug_718_timer_sanitycheck_robustness' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 10 Mar 2011 14:02:57 +0000 (15:02 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 10 Mar 2011 14:02:57 +0000 (15:02 +0100)
commite132702d11760f926735d7d59da1b48006cf549a
tree40e84a8be8611f0f0b815f94477d58e26a328844
parent91bc47683688bc268f010c52b8da7c4fabd6046c
parent7fc419306c3d26d4d9c107ff4bbf1ffcfc157acf
Merge branch 'bug_718_timer_sanitycheck_robustness' into experimental