This commit was manufactured by cvs2svn to create branch 'mpl_v2_2'.

[SVN r18675]
merge latest main trunk fixes


[SVN r18769]