This commit was manufactured by cvs2svn to create branch
'unlabeled-1.6.2'.
Changes for MPL v2