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

[Michael Niedermayer]

ffmpeg | branch: release/0.5 | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 25 20:19:13 2011 +0100| [8755a7890ec60d26c387db5cb48470bcf1f6630e] | committer: Michael Niedermayer

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

* qatar/release/0.5:
  Release notes and changelog for 0.5.6

Conflicts:
	RELEASE

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

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