Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 11:52:05 +0000 (13:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 11:52:09 +0000 (13:52 +0200)
commit8f68ef46817f6795ee89b2720a17ea972c3f6639
tree9c32cd56dbf8731f55b879b79f9fd1a4cf5ff910
parent5f9b1aae504fd6842b049866b0974f710e0bd3ca
parent84146963d23d76b09af633e97413cd97d9b3021e
Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'

* commit '84146963d23d76b09af633e97413cd97d9b3021e':
  configure: x86: Fix handling of i686 and cpunop features

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