root-of-merge
dd8cb791 · This commit was manufactured by cvs2svn to create tag 'root-of-merge'. ·