* commit 'a5f88736':
  silly typo fixes

Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>