[FFmpeg-cvslog] Merge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  9 20:57:32 2014 +0100| [b7c6ccc1e6a15a24734a3133ca2e0110e2b6cbbc] | committer: Michael Niedermayer

Merge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e'

* commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e':
  arm: Remove a stray .fpu directive

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

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