diff --git a/CVSROOT/commitcheck.pl b/CVSROOT/commitcheck.pl
index ad379761cb3..11d946db31a 100755
--- a/CVSROOT/commitcheck.pl
+++ b/CVSROOT/commitcheck.pl
@@ -302,26 +302,6 @@ $fullname{'93'} = 'Zlib';
 sub GetT {
 ($b,$_) = (@_);
 if ($b eq 'HEAD') {
-if (m:^js/src/xpconnect$:) {return '118';}
-if (m:^xpcom/reflect/xptcall$:) {return '118';}
-if (m:^xpcom/reflect/xptinfo$:) {return '118';}
-if (m:^mozilla/mailnews/news/.*$:) {return '122';}
-if (m:^mozilla/mailnews/[^/]*$:) {return '123';}
-if (m:^mozilla/mailnews/mime/[^/]*$:) {return '124';}
-if (m:^mozilla/java/xpcom/.*$:) {return '128';}
-if (m:^mozilla/java/plugins/.*$:) {return '129';}
-if (m:^mozilla/java/webclient/.*$:) {return '127';}
-if (m:^mozilla/java/dom/.*$:) {return '130';}
-if (m:^mozilla/java/util/.*$:) {return '133';}
-if (m:^CVSROOT/commitcheck\.pl$:) {return '3';}
-if (m:^CVSROOT/passwd$:) {return '3';}
-if (m:^mozilla/extensions/xmlterm/.*$:) {return '141';}
-if (m:^mozilla/security/coreconf/.*$:) {return '145';}
-if (m:^mozilla/security/jss/.*$:) {return '145';}
-if (m:^mozilla/security/nss/.*$:) {return '145';}
-if (m:^xpcom/remote$:) {return '143';}
-if (m:^composer$:) {return '173';}
-if (m:^embedding/browser/gtk$:) {return '144';}
 if (m:^mozilla/[^/]*$:) {return '19';}
 if (m:^mozilla/mstone/.*$:) {return '147';}
 if (m:^mozilla/gfx/src/xlib/.*$:) {return '121';}
@@ -431,6 +411,26 @@ if (m:^mozilla/layout/xul/.*$:) {return '106';}
 if (m:^mozilla/profile$:) {return '120';}
 if (m:^mozilla/tools/.*$:) {return '112';}
 if (m:^xpcom/typelib$:) {return '117';}
+if (m:^js/src/xpconnect$:) {return '118';}
+if (m:^xpcom/reflect/xptcall$:) {return '118';}
+if (m:^xpcom/reflect/xptinfo$:) {return '118';}
+if (m:^mozilla/mailnews/news/.*$:) {return '122';}
+if (m:^mozilla/mailnews/[^/]*$:) {return '123';}
+if (m:^mozilla/mailnews/mime/[^/]*$:) {return '124';}
+if (m:^mozilla/java/xpcom/.*$:) {return '128';}
+if (m:^mozilla/java/plugins/.*$:) {return '129';}
+if (m:^mozilla/java/webclient/.*$:) {return '127';}
+if (m:^mozilla/java/dom/.*$:) {return '130';}
+if (m:^mozilla/java/util/.*$:) {return '133';}
+if (m:^CVSROOT/commitcheck\.pl$:) {return '3';}
+if (m:^CVSROOT/passwd$:) {return '3';}
+if (m:^mozilla/extensions/xmlterm/.*$:) {return '141';}
+if (m:^mozilla/security/coreconf/.*$:) {return '145';}
+if (m:^mozilla/security/jss/.*$:) {return '145';}
+if (m:^mozilla/security/nss/.*$:) {return '145';}
+if (m:^xpcom/remote$:) {return '143';}
+if (m:^composer$:) {return '173';}
+if (m:^embedding/browser/gtk$:) {return '144';}
 }
 if ($b eq 'NSPRPUB_PRE_4_2_CLIENT_BRANCH') {
 if (m:^mozilla/nsprpub/.*$:) {return '146';}
diff --git a/CVSROOT/passwd b/CVSROOT/passwd
index c0b1701b93a..55cd772a7ca 100644
--- a/CVSROOT/passwd
+++ b/CVSROOT/passwd
@@ -352,7 +352,7 @@ wade%ezri.org:FeXuLzEvXT132:cvsuser
 waldemar%netscape.com:hrfmZUyM.cQqw:cvsuser
 waterson%maubi.net:UMOoIwsZgkNEM:cvsuser
 wchang0222%aol.com:qv4XOpmSQjJG2:cvsuser
-webmail%kmgerich.com:7ja.jP2JN2oRk:cvsuser
+webmail%kmgerich.com:K7U1HCAoxFv2E:cvsuser
 Xiaobin.Lu%eng.Sun.com:MrrYDdtVNWvV6:cvsuser
 yokoyama%netscape.com:zC32qkz2JNuTc:cvsuser
 yueheng.xu%intel.com:oRvjQhWXcyCIU:cvsuser