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