[FFmpeg-cvslog] Merge commit '9eba675e549c48860601a4018df7756b57623e93' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 13:29:46 2015 +0200| [107615e0c57e5c1fa201b6edb43fe61ea48bcc80] | committer: Michael Niedermayer

Merge commit '9eba675e549c48860601a4018df7756b57623e93' into release/2.2

* commit '9eba675e549c48860601a4018df7756b57623e93':
  configure: Disable i686 for i586 and lower CPUs

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

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