Merge branch 't/uptime_cleanup'

diff --combined NEWS
index 75a628637ae4567ae4d6f6a660cae62849278d1d,50f9b6996c878e9e7762cddf25dbf2a9666bb277..6db7225350f014f80e3f0ad831fe60b93d2777b9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,14 -2,6 +2,14 @@@
  0.4.9 (to be announced) "hybrid causality"
  ------------------------------------------
  
- 
 +      - Fix for an endless loop in the mp3 decoder for certain
 +        (corrupt) mp3 files.
 +      - autogen.sh now detects a distcc setup and adjusts the
 +        parameter for the -j option of make accordingly.
 +      - Shared memory areas are no longer restricted to 64K. We now
 +        detect the maximal size of a shared memory area at runtime.
++      - cleanup of the internal uptime API.
 +
  --------------------------------------
  0.4.8 (2011-08-19) "nested assignment"
  --------------------------------------