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

svn path=; revision=13448
More cleanups for mpl_v2

svn path=; revision=13516
Removed old branches.

svn path=; revision=38550