This commit was manufactured by cvs2svn to create branch
'unlabeled-1.7.4'.
Changes for MPL v2
More cleanups for mpl_v2