[FFmpeg-cvslog] Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 19:29:02 2013 +0200| [c32db6adab9942781cc5a23f62abb839a5595a83] | committer: Michael Niedermayer

Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'

* commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7':
  configure: Properly set zlib dependencies for all components

Conflicts:
	configure

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

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