[FFmpeg-cvslog] Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec  8 14:24:06 2012 +0100| [aba1a48cc5b3f1ee77d5b8e9e72c27bbf3625d85] | committer: Michael Niedermayer

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

* commit 'b326755989b346d0d935e0628e8865f9b2951c30':
  arm: rename ARMVFP config symbol to VFP

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

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