[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 19:44:53 2013 +0100| [5e708b4de3aaa8939ba551bc417754775530eba8] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8:
  Changelog for 0.8.9

Conflicts:
	Changelog

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

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