[FFmpeg-cvslog] Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 13:52:05 2013 +0200| [8f68ef46817f6795ee89b2720a17ea972c3f6639] | committer: Michael Niedermayer

Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'

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

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

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