[FFmpeg-cvslog] Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 20 14:57:58 2014 +0100| [8372aaf7210e0833b17982a3ced304c47e8f668b] | committer: Michael Niedermayer

Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'

* commit '017a06a9ee86b047079166c2694c9c655ff03356':
  x86: dsputil: Use correct file name as multiple inclusion guard

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

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