diff --git a/CVSROOT/commitcheck.pl b/CVSROOT/commitcheck.pl
index a50e348a26e..a7b4dc45322 100755
--- a/CVSROOT/commitcheck.pl
+++ b/CVSROOT/commitcheck.pl
@@ -321,45 +321,6 @@ if ($b eq 'BUGZILLA-2_20-BRANCH') {
 if (m:^mozilla/webtools/bugzilla/.*$:) {return '191';}
 }
 if ($b eq 'HEAD') {
-if (m:^mozilla/modules/security/.*$:) {return '86';}
-if (m:^mozilla/extensions/inspector$:) {return '184';}
-if (m:^mozilla/content/xml/.*$:) {return '88';}
-if (m:^mozilla/extensions/xmlextras/.*$:) {return '88';}
-if (m:^mozilla/parser/expat/.*$:) {return '88';}
-if (m:^content/svg/.*$:) {return '187';}
-if (m:^dom/public/idl/svg/.*$:) {return '187';}
-if (m:^layout/svg/.*$:) {return '187';}
-if (m:^mozilla/xpcom/.*$:) {return '89';}
-if (m:^mozilla/suite/.*$:) {return '188';}
-if (m:^xpcom/io$:) {return '90';}
-if (m:^grendel$:) {return '189';}
-if (m:^mozilla/modules/zlib/.*$:) {return '93';}
-if (m:^mozilla/webtools/bugzilla/.*$:) {return '190';}
-if (m:^gfx/src/xprint$:) {return '179';}
-if (m:^mozilla/view/.*$:) {return '96';}
-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:^modules/libpr0n/decoders/mng/.*$:) {return '155';}
-if (m:^mozilla/modules/libimg/mng/.*$:) {return '155';}
-if (m:^mozilla/layout/style/.*$:) {return '100';}
-if (m:^mozilla/docshell/.*$:) {return '101';}
-if (m:^mozilla/embedding/.*$:) {return '101';}
-if (m:^mozilla/webshell/.*$:) {return '101';}
-if (m:^mozilla/parser/htmlparser$:) {return '102';}
-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/js/rhino/.*$:) {return '138';}
 if (m:^mozilla/xpfe/.*$:) {return '137';}
 if (m:^mozilla/js/tests$:) {return '114';}
 if (m:^js/src/perlconnect$:) {return '111';}
@@ -479,6 +440,45 @@ if (m:^mozilla/modules/libpref/.*$:) {return '82';}
 if (m:^mozilla/extensions/typeaheadfind/.*$:) {return '181';}
 if (m:^mozilla/modules/libreg/.*$:) {return '84';}
 if (m:^mozilla/content/xbl/builtin/.*$:) {return '182';}
+if (m:^mozilla/modules/security/.*$:) {return '86';}
+if (m:^mozilla/extensions/inspector$:) {return '184';}
+if (m:^mozilla/content/xml/.*$:) {return '88';}
+if (m:^mozilla/extensions/xmlextras/.*$:) {return '88';}
+if (m:^mozilla/parser/expat/.*$:) {return '88';}
+if (m:^content/svg/.*$:) {return '187';}
+if (m:^dom/public/idl/svg/.*$:) {return '187';}
+if (m:^layout/svg/.*$:) {return '187';}
+if (m:^mozilla/xpcom/.*$:) {return '89';}
+if (m:^mozilla/suite/.*$:) {return '188';}
+if (m:^xpcom/io$:) {return '90';}
+if (m:^grendel$:) {return '189';}
+if (m:^mozilla/modules/zlib/.*$:) {return '93';}
+if (m:^mozilla/webtools/bugzilla/.*$:) {return '190';}
+if (m:^gfx/src/xprint$:) {return '179';}
+if (m:^mozilla/view/.*$:) {return '96';}
+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:^modules/libpr0n/decoders/mng/.*$:) {return '155';}
+if (m:^mozilla/modules/libimg/mng/.*$:) {return '155';}
+if (m:^mozilla/layout/style/.*$:) {return '100';}
+if (m:^mozilla/docshell/.*$:) {return '101';}
+if (m:^mozilla/embedding/.*$:) {return '101';}
+if (m:^mozilla/webshell/.*$:) {return '101';}
+if (m:^mozilla/parser/htmlparser$:) {return '102';}
+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/js/rhino/.*$:) {return '138';}
 }
 if ($b eq 'NSPRPUB_PRE_4_2_CLIENT_BRANCH') {
 if (m:^mozilla/nsprpub/.*$:) {return '146';}
diff --git a/CVSROOT/passwd b/CVSROOT/passwd
index 37815eaf6ba..3e9ea060e5f 100644
--- a/CVSROOT/passwd
+++ b/CVSROOT/passwd
@@ -195,7 +195,7 @@ karl%kornel.name:9Vq/LWyYItegs:cvsuser
 katakai%japan.sun.com:qJPfrx26UNm2.:cvsuser
 keith%kvisco.com:7u.twuUBsFGJA:cvsuser
 kerz%mozillazine.org:PrxCfYo5gxNi.:cvsuser
-kestes%walrus.com:5Ld0f8MhzQggw:cvsuser
+kestesisme%yahoo.com:5Ld0f8MhzQggw:cvsuser
 kevin%perldap.org:OR9AnICPijq1g:cvsuser
 kieran%eternal.undonet.com:e0BQD7aBxV.m6:cvsuser
 kiko%async.com.br:Uz8pBMTzv6gpo:cvsuser