This commit was manufactured by cvs2svn to create branch 'robstewart'.

[SVN r30118]
Rob Stewart's edits


[SVN r30164]