Merge branch 't/timing_improvements'

diff --cc NEWS
index f76a6e97c1ed9e6d27ddb91a7637b2e550c35fbe,7d330ce48c5528a43156fd7b12833859218e9f1e..49747ccb64326c52f5a3e542c73bf4785dd76953
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -17,8 -17,6 +17,9 @@@ are the highlights of this release
          to replace 5 lines in the config file (one for each audio
          format) by one single line. See the manual for details.
        - Compiles cleanly also with llvm/clang.
 +      - Corrupt mp3 files are handled more gracefully.
 +      - sched: Optimized zero timeouts.
++      - vss timeout cleanups.
  
  --------------------------------------
  0.4.7 (2011-06-01) "infinite rollback"

diff --cc sched.c
Simple merge