* commit '652f5185':
  x86: mmx2 ---> mmxext in comments and messages

Conflicts:
	libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>