[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  1 18:24:31 2011 +0200| [03cbe6c8bc42626107e75b001180b81781619ed7] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
Not merged:  Remove the ffserver test.
  Remove ffserver.h

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

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