Original commit message from CVS: Added support for PNG/XMP. Indentation. And fixed pull mode to parse the file.