Merge branch 'master' of ssh://synfig.git.sourceforge.net/gitroot/synfig/synfig into...
authorNikita Kitaev <nikitakit@gmail.com>
Tue, 1 Jun 2010 21:07:41 +0000 (14:07 -0700)
committerNikita Kitaev <nikitakit@gmail.com>
Tue, 1 Jun 2010 21:07:41 +0000 (14:07 -0700)

Trivial merge