[FFmpeg-cvslog] Merge commit '852c329a69ddfd635807f60454df07d021c64901'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 19 18:00:20 2014 +0200| [a68c05cf13c986b73b0932e8eb6aaf7f9cb0f37f] | committer: Michael Niedermayer

Merge commit '852c329a69ddfd635807f60454df07d021c64901'

* commit '852c329a69ddfd635807f60454df07d021c64901':
  configure: Drop duplicate pkg-config entry from help output

Conflicts:
	configure

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

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