[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> | Sat Jun  9 19:17:22 2012 +0200| [eefd6bbee90a13fcb9c6fe7ab4f679c82381799c] | committer: Michael Niedermayer

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

* qatar/release/0.8:
  cmdutils: update copyright year to 2012.

Conflicts:
	cmdutils.c

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

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