This commit was manufactured by cvs2svn to create branch 'robstewart'.
Rob Stewart's edits