Merge branch 't/crypto'

diff --cc NEWS
index 5105798f57fabc447fdc2c3630cb8363a6c7486b,57ef197ba3e9dbba332ec208c43d90f48cfd5040..7d330ce48c5528a43156fd7b12833859218e9f1e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,12 -2,10 +2,21 @@@
  0.4.8 (to be announced) "nested assignment"
  -------------------------------------------
  
++Gcrypt support, the overhauled osx writer and regex format specifiers
++are the highlights of this release.
++
++      - support for libgcrypt as a drop-in replacement for openssl.
++        Run configure --enable-cryptolib=gcrypt to link against
++        libgcrypt. The two crypto implementations are compatible to
++        each other, i.e. a para_client executable linked against
++        gcrypt can connect to para_server linked against libssl
++        and vice versa.
++      - Rewrite of the osx writer (output plugin for Mac OS).
        - audiod: The format specifier for receivers, filters and
          writers is now treated as a regular expression. This allows
          to replace 5 lines in the config file (one for each audio
          format) by one single line. See the manual for details.
-       - Rewrite of the osx writer (output plugin for Mac OS).
 +      - Compiles cleanly also with llvm/clang.
  
  --------------------------------------
  0.4.7 (2011-06-01) "infinite rollback"

diff --cc configure.ac
Simple merge

diff --cc web/manual.m4
Simple merge