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

[Michael Niedermayer]

ffmpeg | branch: release/0.6 | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 25 20:11:09 2011 +0100| [d32ea79ea2afdca9f7a3979dc4294b5275d410be] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.6' into release/0.6

* qatar/release/0.6:
  Release notes and changelog for 0.6.4

Conflicts:
	Changelog

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

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