Merge branch 't/decl_after_statement'

diff --cc NEWS
index bf6f2bab2f93c1ecd414de569d3469a8c0f89676,bf6f2bab2f93c1ecd414de569d3469a8c0f89676..c56fc719818f1f1de737e44945ac08e1906773d4
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,6 -2,6 +2,9 @@@
  0.4.7 (to be announced) "infinite rollback"
  -------------------------------------------
  
++The new ao writer, support for ssh RSA keys and a couple of other
++enhancements.
++
        - Support for ESD, Pulseaudio, AIX, Solaris, IRIX and other
          platforms through the libao audio library.
        - Support for RSA keys generated with ssh-keygen.
@@@ -10,6 -10,6 +13,7 @@@
        - The autogen script detects the number of processors and
          runs a parallel make if possible.
        - Major cleanup of the crypto API.
++      - Documentation updates.
  
  ------------------------------------------
  0.4.6 (2011-03-31) "deterministic entropy"