Merge branch 'maint'

Conflicts:
	Makefile.in
	NEWS

diff --cc NEWS
index f71c579c17191d5feee80fe07379c4fd7fc9e36c,3cee9fffb67b315d360dc18037f558829e3e5543..9d9530092caf6ff162b6467212337de186045745
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,34 -1,24 +1,52 @@@
  NEWS
  ====
  
 +----------------------------------------------
 +0.4.1 (to be announced) "concurrent eternalty"
 +----------------------------------------------
 +
 +      - wma support
 +
+ ------------------------------------------
+ 0.3.6 (to be announced) "cubic continuity"
+ ------------------------------------------
+ 
+ Quite a few bugs have been found and fixed since 0.3.5, so here's
+ another 0.3.x release. No new features.
+ 
+       - Always check return value of malloc().
+       - ogg vorbis/FEC: Do not write garbage after the audio file header.
+       - exit if root privileges could not be dropped.
+       - FEC: Fix computation of extra slices.
+       - oss: Fix check for empty input buffer.
+       - Avoid buffer underruns due to filter chain output buffer constraints.
+       - server: Fix assignment of afs_pid.
+       - Don't panic if the afs database contains unknown audio formats.
+       - http/dccp: Do not send the audio file header twice.
+       - FEC: Timing improvements.
+ 
 +----------------------------------------------
 +0.4.0 (2009-11-10) "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
 +      - cleanup of the build system
 +      - The "-V" option now also prints the git version
 +      - 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"
  --------------------------------------------