This commit was manufactured by cvs2svn to create branch 'mpl_v2_2'.
merge latest main trunk fixes