[commit] rev 569: Merged from Stephen Leake: xmtn improvements

Committed revision 569 to http://bzr.xsteve.at/dvc/

Merged from Stephen Leake: xmtn improvements