Merge branch 'eldruin_ffmpeg' of ssh://synfig.git.sourceforge.net/gitroot/synfig...
authorDiego Barrios Romero <eldruin@gmailcom>
Wed, 27 Jan 2010 17:42:50 +0000 (18:42 +0100)
committerDiego Barrios Romero <eldruin@gmailcom>
Wed, 27 Jan 2010 17:42:50 +0000 (18:42 +0100)

Trivial merge