[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 25 11:26:15 2013 +0100| [25010f511cb04f81d14159659a0ef8ac734f3762] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Add the host executable suffix for the print_options dependency

See: d48f014ff1db985fa3f74eddfb30bf513f99ff7a
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25010f511cb04f81d14159659a0ef8ac734f3762
---