This commit was manufactured by cvs2svn to create branch 'mac-win'.