Merge branch 'master' of kramm@git.swftools.org:/home/git/swftools