Changes for MPL v2
This commit was manufactured by cvs2svn to create branch
'unlabeled-1.11.2'.
*** empty log message ***