[Synfig-devl] Carlos Lopez : Merge branch 'eldruin_ffmpeg2'

[Genete <ge...@us...>]

Module: synfig
Branch: master
Commit: d142890f6a23f6736747978763468faa7581aab0
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=d142890f6a23f6736747978763468faa7581aab0

Author: Carlos Lopez <gen...@gm...>
Date:   Fri Mar 12 18:07:14 2010 +0100

Merge branch 'eldruin_ffmpeg2'

---