Merge branch 'master' into next

Conflicts:
	client_common.c

diff --combined NEWS
index 9c13ed8129ade866cdec46e8e3c55875e7e664af,8f225d82534b5085daab1f014a9e4651dbde63b5..68c3f406ece95d109e2b74283144d8d047763e1e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,25 -1,6 +1,25 @@@
  NEWS
  ====
  
 +---------------------------------------------------
 +0.4.0 (to be announced) "simultaneous independence"
 +---------------------------------------------------
 +
 +Two significant changes which require the new version number: The
 +improved authentication dialog and the fact that the database code
 +has been moved to a library, libosl. To use the new version, you have
 +to generate new RSA keys, see INSTALL for details. A shell script is
 +provided for conversion of the 0.3 database to the new 0.4 format.
 +
 +      - stronger crypto for client authentication
 +      - the database code has been moved to a library
 +      - improved status item handling
 +      - the new parser-friendly listing mode for the ls and stat commands
 +      - mandatory rc4 encryption
 +      - major audio format handler cleanups
 +      - improved tag handling
 +      - lots of new mood methods
 +
  -------------------------------------------------
  0.3.5 (to be announced) "symplectic separability"
  -------------------------------------------------
@@@ -32,6 -13,7 +32,7 @@@
        - --log_color actually works
        - new ls option: -d (print dates as seconds after the epoch)
        - update to gengetopt 2.22.2
+       - support for RSA keys of size > 512 bits
  
  -----------------------------------------
  0.3.4 (2009-05-07) "elliptic inheritance"