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