Merge commit '9030c58a780a02fb8256cb75cd39275eaad786d1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Sep 2014 18:05:50 +0000 (20:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Sep 2014 18:08:21 +0000 (20:08 +0200)
* commit '9030c58a780a02fb8256cb75cd39275eaad786d1':
  configure: Disable i686 for i586 and lower CPUs

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

Trivial merge