Merge commit 'b37bfbfbe53917820d1f97312fa0b2e8c7a15217' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 20:02:26 +0000 (22:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 20:02:40 +0000 (22:02 +0200)
* commit 'b37bfbfbe53917820d1f97312fa0b2e8c7a15217':
  configure: Disable i686 for i586 and lower CPUs

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

Trivial merge