This commit was manufactured by cvs2svn to create branch
'unlabeled-1.1.6'.

[SVN r12658]
Changes for MPL v2


[SVN r13504]
More cleanups for mpl_v2


[SVN r13516]