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

[SVN r7663]