Merge release 0.15.11 from branch 'v0.15.x

Conflicts:
	NEWS
	configure.ac
	src/decoder/ffmpeg_decoder_plugin.c
	src/decoder/mikmod_decoder_plugin.c
	src/decoder/mp4ff_decoder_plugin.c
	src/decoder/vorbis_decoder_plugin.c
	src/directory_print.c
	src/playlist_control.c
	src/tag_ape.c

NEWS

@@ -20,7 +20,7 @@ ver 0.16 (20??/??/??)
 * tags:
   - added tags "ArtistSort", "AlbumArtistSort"
   - id3: revised "performer" tag support
-  - ape: support album artist, MusicBrainz tags
+  - ape: MusicBrainz tags
 * decoders:
   - don't try a plugin twice (MIME type & suffix)
   - don't fall back to "mad" unless no plugin matches
@@ -38,8 +38,6 @@ ver 0.16 (20??/??/??)
   - wavpack: activate 32 bit support
   - wavpack: allow more than 2 channels
   - mp4ff: rename plugin "mp4" to "mp4ff"
-  - mp4ff: support tags "album artist", "albumartist", "band"
-  - mikmod: fix memory leak
 * encoders:
   - twolame: new encoder plugin based on libtwolame
   - flac: new encoder plugin based on libFLAC
@@ -105,6 +103,21 @@ ver 0.16 (20??/??/??)
 * added libwrap support
 
 
+ver 0.15.11 (2010/06/14)
+* tags:
+  - ape: support album artist
+* decoders:
+  - mp4ff: support tags "album artist", "albumartist", "band"
+  - mikmod: fix memory leak
+  - vorbis: handle uri==NULL
+  - ffmpeg: fix memory leak
+  - ffmpeg: free AVFormatContext on error
+  - ffmpeg: read more metadata
+  - ffmpeg: fix libavformat 0.6 by using av_open_input_stream()
+* playlist: emit IDLE_OPTIONS when resetting single mode
+* listen: make get_remote_uid() work on BSD
+
+
 ver 0.15.10 (2010/05/30)
 * input:
   - mms: fix memory leak in error handler

src/playlist_control.c

@@ -25,6 +25,7 @@
 #include "config.h"
 #include "playlist_internal.h"
 #include "player_control.h"
+#include "idle.h"
 
 #include <glib.h>