Merge branch 'xml-cleanup' of git://git.pipapo.org/cinelerra/ichthyo into ct