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

svn path=; revision=30118
Rob Stewart's edits

svn path=; revision=30164
Removed old branches.

svn path=; revision=38550