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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  7 04:14:09 2011 +0200| [e5a85164b100620fe529bae0ce623956f0bab2e9] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
  mov: fix composition timestamps on movie fragments.
  wmavoice: Use proper size in memeset().

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