[FFmpeg-cvslog] Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 02:06:41 2014 +0100| [fd982f2b40b8908a71d25202f0e6842206d8a78a] | committer: Michael Niedermayer

Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'

* commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8':
  configure: avserver does not need $ldl

Conflicts:
	configure

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

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