Merge branch 'master' into next

Conflicts:

	NEWS

diff --cc NEWS
index bf45722a9b9619b88cd63f6887cd0db74e715bd8,52d2b7cb08e866ab21a8ddd5e8182761a6398954..cf24914c8461bd0ad176d74c70e4dc8f34fd266b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,29 -1,9 +1,29 @@@
  NEWS
  ====
  
- -------------------------------------------------
- 0.3.5 (to be announced) "symplectic separability"
- -------------------------------------------------
 +---------------------------------------------------
 +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
 +      - (id3,...) tags are no longer stored as a combined string in the database
 +      - new mood methods: artist_matches, title_matches, comment_matches,
 +        album_matches, year_maches, year.
 +
+ --------------------------------------------
+ 0.3.5 (2009-09-21) "symplectic separability"
+ --------------------------------------------
  
  Full client support for *BSD Unixes, complete re-write of the ogg
  vorbis audio format handler, various improvements all over the place