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

svn path=; revision=13151
Changes for MPL v2

svn path=; revision=13504
Removed old branches.

svn path=; revision=38550