[FFmpeg-cvslog] Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  4 10:17:52 2013 +0200| [0104570fb65bef9986a630e0188b3756295693a9] | committer: Michael Niedermayer

Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes

Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck

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

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