diff --git a/CVSROOT/commitcheck.pl b/CVSROOT/commitcheck.pl
index 2fb9af7fe70..ca6804bf259 100755
--- a/CVSROOT/commitcheck.pl
+++ b/CVSROOT/commitcheck.pl
@@ -320,97 +320,16 @@ if ($b eq 'BUGZILLA-3_0-BRANCH') {
 if (m:^mozilla/webtools/bugzilla/.*$:) {return '212';}
 }
 if ($b eq 'HEAD') {
-if (m:^mozilla/tools/wizards/.*$:) {return '89';}
-if (m:^mozilla/xpcom/[^/]*$:) {return '89';}
-if (m:^mozilla/xpcom/base/.*$:) {return '89';}
-if (m:^mozilla/xpcom/build/.*$:) {return '89';}
-if (m:^mozilla/xpcom/components/.*$:) {return '89';}
-if (m:^mozilla/xpcom/doc/.*$:) {return '89';}
-if (m:^mozilla/xpcom/ds/.*$:) {return '89';}
-if (m:^mozilla/xpcom/glue/.*$:) {return '89';}
-if (m:^mozilla/xpcom/MoreFiles/.*$:) {return '89';}
-if (m:^mozilla/xpcom/obsolete/.*$:) {return '89';}
-if (m:^mozilla/xpcom/proxy/.*$:) {return '89';}
-if (m:^mozilla/xpcom/sample/.*$:) {return '89';}
-if (m:^mozilla/xpcom/stub/.*$:) {return '89';}
-if (m:^mozilla/xpcom/tests/.*$:) {return '89';}
-if (m:^mozilla/xpcom/threads/.*$:) {return '89';}
-if (m:^mozilla/xpcom/tools/.*$:) {return '89';}
-if (m:^mozilla/xpcom/windbgdlg/.*$:) {return '89';}
-if (m:^mozilla/content/xtf/.*$:) {return '200';}
-if (m:^mozilla/layout/xtf/.*$:) {return '200';}
-if (m:^mozilla/gfx/[^/]*$:) {return '201';}
-if (m:^mozilla/gfx/cairo/.*$:) {return '201';}
-if (m:^mozilla/gfx/public/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/[^/]*$:) {return '201';}
-if (m:^mozilla/gfx/src/gtk/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/mac/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/shared/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/thebes/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/windows/.*$:) {return '201';}
-if (m:^mozilla/gfx/thebes/.*$:) {return '201';}
-if (m:^mozilla/xpcom/reflect/xptcall/.*$:) {return '206';}
-if (m:^mozilla/gfx/src/xprint/.*$:) {return '179';}
-if (m:^mozilla/view/.*$:) {return '96';}
-if (m:^mozilla/xpinstall/.*$:) {return '150';}
-if (m:^mozilla/layout/[^/]*$:) {return '98';}
-if (m:^mozilla/layout/base/.*$:) {return '98';}
-if (m:^mozilla/layout/build/.*$:) {return '98';}
-if (m:^mozilla/layout/doc/.*$:) {return '98';}
-if (m:^mozilla/layout/forms/.*$:) {return '98';}
-if (m:^mozilla/layout/generic/.*$:) {return '98';}
-if (m:^mozilla/layout/html/.*$:) {return '98';}
-if (m:^mozilla/layout/macbuild/.*$:) {return '98';}
-if (m:^mozilla/layout/printing/.*$:) {return '98';}
-if (m:^mozilla/layout/tables/.*$:) {return '98';}
-if (m:^mozilla/layout/tools/.*$:) {return '98';}
-if (m:^mozilla/security/manager/.*$:) {return '151';}
-if (m:^mozilla/layout/style/.*$:) {return '100';}
-if (m:^mozilla/webtools/addons/.*$:) {return '185';}
-if (m:^mozilla/webtools/aus/.*$:) {return '185';}
-if (m:^mozilla/webtools/update/.*$:) {return '185';}
-if (m:^mozilla/docshell/.*$:) {return '101';}
-if (m:^mozilla/uriloader/.*$:) {return '101';}
-if (m:^mozilla/webshell/.*$:) {return '101';}
-if (m:^mozilla/mailnews/movemail/.*$:) {return '157';}
-if (m:^CVSROOT/commitcheck\.pl$:) {return '3';}
-if (m:^CVSROOT/passwd$:) {return '3';}
-if (m:^mozilla/parser/htmlparser$:) {return '102';}
-if (m:^mozilla/embedding/.*$:) {return '208';}
-if (m:^mozilla/content/base/.*$:) {return '103';}
-if (m:^mozilla/content/events/.*$:) {return '103';}
-if (m:^mozilla/content/html/content/.*$:) {return '103';}
-if (m:^mozilla/content/html/document/.*$:) {return '103';}
-if (m:^mozilla/dom/.*$:) {return '103';}
-if (m:^mozilla/string/.*$:) {return '160';}
-if (m:^mozilla/xpcom/string/.*$:) {return '160';}
-if (m:^mozilla/dbm/.*$:) {return '145';}
-if (m:^mozilla/security/coreconf/.*$:) {return '145';}
-if (m:^mozilla/security/dbm/.*$:) {return '145';}
-if (m:^mozilla/security/jss/.*$:) {return '145';}
-if (m:^mozilla/security/nss/.*$:) {return '145';}
-if (m:^mozilla/js/rhino/.*$:) {return '138';}
-if (m:^mozilla/gfx/src/qt/.*$:) {return '161';}
-if (m:^mozilla/widget/src/qt/.*$:) {return '161';}
-if (m:^mozilla/composer/.*$:) {return '173';}
-if (m:^mozilla/xpfe/.*$:) {return '137';}
-if (m:^mozilla/[^/]*$:) {return '19';}
-if (m:^mozilla/tools/README$:) {return '19';}
-if (m:^mozilla/js/tests/.*$:) {return '114';}
-if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
-if (m:^mozilla/gfx/src/xlib/.*$:) {return '121';}
-if (m:^mozilla/widget/src/xlib/.*$:) {return '121';}
-if (m:^mozilla/widget/src/xlibxtbin/.*$:) {return '121';}
-if (m:^mozilla/layout/mathml/.*$:) {return '165';}
 if (m:^mozilla/webtools/partytool/.*$:) {return '209';}
-if (m:^mozilla/content/xslt/.*$:) {return '140';}
-if (m:^mozilla/extensions/transformiix/.*$:) {return '140';}
-if (m:^mozilla/browser/.*$:) {return '166';}
-if (m:^mozilla/other-licenses/branding/firefox/.*$:) {return '166';}
+if (m:^mozilla/layout/mathml/.*$:) {return '165';}
 if (m:^mozilla/widget/src/gtk/.*$:) {return '49';}
 if (m:^mozilla/widget/src/gtk2/.*$:) {return '49';}
 if (m:^mozilla/widget/src/gtksuperwin/.*$:) {return '49';}
 if (m:^mozilla/widget/src/gtkxtbin/.*$:) {return '49';}
+if (m:^mozilla/content/xslt/.*$:) {return '140';}
+if (m:^mozilla/extensions/transformiix/.*$:) {return '140';}
+if (m:^mozilla/browser/.*$:) {return '166';}
+if (m:^mozilla/other-licenses/branding/firefox/.*$:) {return '166';}
 if (m:^mozilla/rdf/.*$:) {return '52';}
 if (m:^mozilla/calendar/.*$:) {return '183';}
 if (m:^mozilla/chrome/.*$:) {return '169';}
@@ -543,6 +462,87 @@ if (m:^mozilla/parser/expat/.*$:) {return '88';}
 if (m:^mozilla/content/xbl/[^/]*$:) {return '199';}
 if (m:^mozilla/content/xbl/public/.*$:) {return '199';}
 if (m:^mozilla/content/xbl/src/.*$:) {return '199';}
+if (m:^mozilla/tools/wizards/.*$:) {return '89';}
+if (m:^mozilla/xpcom/[^/]*$:) {return '89';}
+if (m:^mozilla/xpcom/base/.*$:) {return '89';}
+if (m:^mozilla/xpcom/build/.*$:) {return '89';}
+if (m:^mozilla/xpcom/components/.*$:) {return '89';}
+if (m:^mozilla/xpcom/doc/.*$:) {return '89';}
+if (m:^mozilla/xpcom/ds/.*$:) {return '89';}
+if (m:^mozilla/xpcom/glue/.*$:) {return '89';}
+if (m:^mozilla/xpcom/MoreFiles/.*$:) {return '89';}
+if (m:^mozilla/xpcom/obsolete/.*$:) {return '89';}
+if (m:^mozilla/xpcom/proxy/.*$:) {return '89';}
+if (m:^mozilla/xpcom/sample/.*$:) {return '89';}
+if (m:^mozilla/xpcom/stub/.*$:) {return '89';}
+if (m:^mozilla/xpcom/tests/.*$:) {return '89';}
+if (m:^mozilla/xpcom/threads/.*$:) {return '89';}
+if (m:^mozilla/xpcom/tools/.*$:) {return '89';}
+if (m:^mozilla/xpcom/windbgdlg/.*$:) {return '89';}
+if (m:^mozilla/content/xtf/.*$:) {return '200';}
+if (m:^mozilla/layout/xtf/.*$:) {return '200';}
+if (m:^mozilla/gfx/[^/]*$:) {return '201';}
+if (m:^mozilla/gfx/cairo/.*$:) {return '201';}
+if (m:^mozilla/gfx/public/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/[^/]*$:) {return '201';}
+if (m:^mozilla/gfx/src/gtk/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/mac/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/shared/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/thebes/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/windows/.*$:) {return '201';}
+if (m:^mozilla/gfx/thebes/.*$:) {return '201';}
+if (m:^mozilla/xpcom/reflect/xptcall/.*$:) {return '206';}
+if (m:^mozilla/gfx/src/xprint/.*$:) {return '179';}
+if (m:^mozilla/view/.*$:) {return '96';}
+if (m:^mozilla/xpinstall/.*$:) {return '150';}
+if (m:^mozilla/layout/[^/]*$:) {return '98';}
+if (m:^mozilla/layout/base/.*$:) {return '98';}
+if (m:^mozilla/layout/build/.*$:) {return '98';}
+if (m:^mozilla/layout/doc/.*$:) {return '98';}
+if (m:^mozilla/layout/forms/.*$:) {return '98';}
+if (m:^mozilla/layout/generic/.*$:) {return '98';}
+if (m:^mozilla/layout/html/.*$:) {return '98';}
+if (m:^mozilla/layout/macbuild/.*$:) {return '98';}
+if (m:^mozilla/layout/printing/.*$:) {return '98';}
+if (m:^mozilla/layout/tables/.*$:) {return '98';}
+if (m:^mozilla/layout/tools/.*$:) {return '98';}
+if (m:^mozilla/security/manager/.*$:) {return '151';}
+if (m:^mozilla/layout/style/.*$:) {return '100';}
+if (m:^mozilla/webtools/addons/.*$:) {return '185';}
+if (m:^mozilla/webtools/aus/.*$:) {return '185';}
+if (m:^mozilla/webtools/update/.*$:) {return '185';}
+if (m:^CVSROOT/commitcheck\.pl$:) {return '3';}
+if (m:^CVSROOT/passwd$:) {return '3';}
+if (m:^mozilla/docshell/.*$:) {return '101';}
+if (m:^mozilla/uriloader/.*$:) {return '101';}
+if (m:^mozilla/webshell/.*$:) {return '101';}
+if (m:^mozilla/mailnews/movemail/.*$:) {return '157';}
+if (m:^mozilla/parser/htmlparser$:) {return '102';}
+if (m:^mozilla/embedding/.*$:) {return '208';}
+if (m:^mozilla/dbm/.*$:) {return '145';}
+if (m:^mozilla/security/coreconf/.*$:) {return '145';}
+if (m:^mozilla/security/dbm/.*$:) {return '145';}
+if (m:^mozilla/security/jss/.*$:) {return '145';}
+if (m:^mozilla/security/nss/.*$:) {return '145';}
+if (m:^mozilla/content/base/.*$:) {return '103';}
+if (m:^mozilla/content/events/.*$:) {return '103';}
+if (m:^mozilla/content/html/content/.*$:) {return '103';}
+if (m:^mozilla/content/html/document/.*$:) {return '103';}
+if (m:^mozilla/dom/.*$:) {return '103';}
+if (m:^mozilla/string/.*$:) {return '160';}
+if (m:^mozilla/xpcom/string/.*$:) {return '160';}
+if (m:^mozilla/composer/.*$:) {return '173';}
+if (m:^mozilla/js/rhino/.*$:) {return '138';}
+if (m:^mozilla/gfx/src/qt/.*$:) {return '161';}
+if (m:^mozilla/widget/src/qt/.*$:) {return '161';}
+if (m:^mozilla/[^/]*$:) {return '19';}
+if (m:^mozilla/tools/README$:) {return '19';}
+if (m:^mozilla/xpfe/.*$:) {return '137';}
+if (m:^mozilla/gfx/src/xlib/.*$:) {return '121';}
+if (m:^mozilla/widget/src/xlib/.*$:) {return '121';}
+if (m:^mozilla/widget/src/xlibxtbin/.*$:) {return '121';}
+if (m:^mozilla/js/tests/.*$:) {return '114';}
+if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
 }
 if ($b eq 'NSPRPUB_PRE_4_2_CLIENT_BRANCH') {
 if (m:^mozilla/nsprpub/.*$:) {return '146';}