[FFmpeg-cvslog] Merge commit 'b00444c0bbbc78ae477ec697d6569893609f420d' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 14:06:52 2014 +0200| [4ccde2d356e73430738380cb8b94575bdf707f9b] | committer: Michael Niedermayer

Merge commit 'b00444c0bbbc78ae477ec697d6569893609f420d' into release/1.1

* commit 'b00444c0bbbc78ae477ec697d6569893609f420d':
  configure: Update freetype check to follow upstream

Conflicts:
	configure

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

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