* src/video_output/vout_subpictures.c: a few fixes for subpictures positionning when scaling is active.

* modules/video_filter/logo.c: new --logo-position option (by default the logo is displayed on the top right)

"* modules/mux/wav.c: support for s16l as well as fl32 + multichannel audio (up to 5.1) + proper channels ordering."

in Platform:

* src/libvlc.c: use dameon() instead of fork() when available. It does some more things like reopening stdin/out/err to /dev/null which avoids screwing up the first sockets we open.

* Add timeout support (marq-timeout, in milliseconds, 0 for no timeout)
* A few minor coding style fixes

* modules/demux/ps.c: improved MPEG PS autodetection a bit.

change

Modules.am: link mkv demux with mp4 demux
mp4/*: export some functions needed by mkv demux

nastyness to a central location. Improves the general readability in my
opinion.

when needed. Zlib-compressed vobsubs work for me now.

* added some clarifications on use of bootstrap to HACKING file