XML diff and merge Vaclav Barta <vbar@comp.cz>