* qatar/master:
  x86inc: Remove .rodata kludges

Conflicts:
	libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>