[FFmpeg-cvslog] Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 19:03:33 2013 +0200| [1faece7eccdb35df1cdd5363c4bbc67f6a668755] | committer: Michael Niedermayer

Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'

* commit '406e6c0ba5393fa302080202fe77bd09187889a1':
  configure: Properly split avserver component and system dependencies

Conflicts:
	configure

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

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