diff --git a/CVSROOT/commitcheck.pl b/CVSROOT/commitcheck.pl
index d90682ca57f..10fcceac7a6 100755
--- a/CVSROOT/commitcheck.pl
+++ b/CVSROOT/commitcheck.pl
@@ -319,6 +319,35 @@ if ($b eq 'BUGZILLA-2_20-BRANCH') {
 if (m:^mozilla/webtools/bugzilla/.*$:) {return '191';}
 }
 if ($b eq 'HEAD') {
+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:^mozilla/js/src/perlconnect/.*$:) {return '111';}
+if (m:^mozilla/content/xslt/.*$:) {return '140';}
+if (m:^mozilla/extensions/transformiix/.*$:) {return '140';}
+if (m:^mozilla/calendar/.*$:) {return '183';}
+if (m:^mozilla/gfx/src/photon/.*$:) {return '113';}
+if (m:^mozilla/widget/src/photon/.*$:) {return '113';}
+if (m:^mozilla/content/xul/.*$:) {return '106';}
+if (m:^mozilla/layout/xul/.*$:) {return '106';}
+if (m:^mozilla/profile/.*$:) {return '120';}
+if (m:^mozilla/tools/.*$:) {return '112';}
+if (m:^mozilla/xpcom/typelib/.*$:) {return '117';}
+if (m:^mozilla/js/src/xpconnect/.*$:) {return '118';}
+if (m:^mozilla/xpcom/libxpt/.*$:) {return '118';}
+if (m:^mozilla/xpcom/reflect/.*$:) {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/extensions/java$:) {return '128';}
@@ -334,66 +363,66 @@ if (m:^mozilla/layout/xtf/.*$:) {return '200';}
 if (m:^mozilla/extensions/xmlterm/.*$:) {return '141';}
 if (m:^CVSROOT/commitcheck\.pl$:) {return '3';}
 if (m:^CVSROOT/passwd$:) {return '3';}
+if (m:^mozilla/mstone/.*$:) {return '147';}
 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/mstone/.*$:) {return '147';}
-if (m:^mozilla/composer/.*$:) {return '173';}
 if (m:^mozilla/xpinstall/.*$:) {return '150';}
-if (m:^mozilla/[^/]*$:) {return '19';}
+if (m:^mozilla/composer/.*$:) {return '173';}
 if (m:^mozilla/security/manager/.*$:) {return '151';}
+if (m:^mozilla/[^/]*$:) {return '19';}
+if (m:^mozilla/webtools/addons/.*$:) {return '185';}
+if (m:^mozilla/webtools/update/.*$:) {return '185';}
 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/webtools/addons/.*$:) {return '185';}
-if (m:^mozilla/webtools/update/.*$:) {return '185';}
-if (m:^mozilla/ef/.*$:) {return '46';}
 if (m:^mozilla/extensions/vixen/.*$:) {return '156';}
+if (m:^mozilla/ef/.*$:) {return '46';}
+if (m:^mozilla/mailnews/movemail/.*$:) {return '157';}
 if (m:^mozilla/gfx/src/gtk/.*$:) {return '49';}
 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/mailnews/movemail/.*$:) {return '157';}
-if (m:^mozilla/rdf/.*$:) {return '52';}
 if (m:^mozilla/uriloader/.*$:) {return '158';}
+if (m:^mozilla/rdf/.*$:) {return '52';}
 if (m:^mozilla/dbm/.*$:) {return '53';}
-if (m:^mozilla/build/.*$:) {return '55';}
-if (m:^mozilla/config/.*$:) {return '55';}
 if (m:^mozilla/string/.*$:) {return '160';}
 if (m:^mozilla/xpcom/string/.*$:) {return '160';}
-if (m:^mozilla/editor/.*$:) {return '56';}
+if (m:^mozilla/build/.*$:) {return '55';}
+if (m:^mozilla/config/.*$:) {return '55';}
 if (m:^mozilla/gfx/src/qt/.*$:) {return '161';}
 if (m:^mozilla/widget/src/qt/.*$:) {return '161';}
+if (m:^mozilla/editor/.*$:) {return '56';}
 if (m:^mozilla/directory/buildsdk\.txt$:) {return '59';}
 if (m:^mozilla/directory/c-sdk/.*$:) {return '59';}
 if (m:^mozilla/directory/ldapsdk\.mak$:) {return '59';}
 if (m:^mozilla/directory/ldapsdk\.mk$:) {return '59';}
 if (m:^mozilla/directory/Makefile$:) {return '59';}
+if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
 if (m:^mozilla/gfx/src/ps/.*$:) {return '62';}
 if (m:^mozilla/gfx/src/psshared/.*$:) {return '62';}
-if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
-if (m:^mozilla/modules/libpr0n/.*$:) {return '63';}
 if (m:^mozilla/layout/mathml/.*$:) {return '165';}
-if (m:^mozilla/jpeg/.*$:) {return '64';}
+if (m:^mozilla/modules/libpr0n/.*$:) {return '63';}
 if (m:^mozilla/browser/.*$:) {return '166';}
 if (m:^mozilla/other-licenses/branding/firefox/.*$:) {return '166';}
-if (m:^mozilla/modules/libimg/png/.*$:) {return '65';}
+if (m:^mozilla/jpeg/.*$:) {return '64';}
 if (m:^mozilla/chrome/.*$:) {return '169';}
 if (m:^mozilla/storage/.*$:) {return '169';}
 if (m:^mozilla/toolkit/.*$:) {return '169';}
 if (m:^mozilla/xulrunner/.*$:) {return '169';}
-if (m:^mozilla/intl/.*$:) {return '67';}
+if (m:^mozilla/modules/libimg/png/.*$:) {return '65';}
 if (m:^mozilla/mail/.*$:) {return '170';}
 if (m:^mozilla/other-licenses/branding/thunderbird/.*$:) {return '170';}
+if (m:^mozilla/intl/.*$:) {return '67';}
+if (m:^mozilla/extensions/cookie/.*$:) {return '171';}
 if (m:^mozilla/modules/oji/.*$:) {return '68';}
 if (m:^mozilla/nav-java/.*$:) {return '68';}
 if (m:^mozilla/sun-java/.*$:) {return '68';}
-if (m:^mozilla/extensions/cookie/.*$:) {return '171';}
-if (m:^mozilla/caps/.*$:) {return '69';}
 if (m:^mozilla/gfx/src/beos/.*$:) {return '172';}
 if (m:^mozilla/widget/src/beos/.*$:) {return '172';}
+if (m:^mozilla/caps/.*$:) {return '69';}
 if (m:^mozilla/js/src/[^/]*$:) {return '70';}
 if (m:^mozilla/js/src/config/.*$:) {return '70';}
 if (m:^mozilla/js/src/editline/.*$:) {return '70';}
@@ -468,35 +497,6 @@ 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/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:^mozilla/js/src/perlconnect/.*$:) {return '111';}
-if (m:^mozilla/content/xslt/.*$:) {return '140';}
-if (m:^mozilla/extensions/transformiix/.*$:) {return '140';}
-if (m:^mozilla/calendar/.*$:) {return '183';}
-if (m:^mozilla/gfx/src/photon/.*$:) {return '113';}
-if (m:^mozilla/widget/src/photon/.*$:) {return '113';}
-if (m:^mozilla/content/xul/.*$:) {return '106';}
-if (m:^mozilla/layout/xul/.*$:) {return '106';}
-if (m:^mozilla/profile/.*$:) {return '120';}
-if (m:^mozilla/tools/.*$:) {return '112';}
-if (m:^mozilla/xpcom/typelib/.*$:) {return '117';}
-if (m:^mozilla/js/src/xpconnect/.*$:) {return '118';}
-if (m:^mozilla/xpcom/libxpt/.*$:) {return '118';}
-if (m:^mozilla/xpcom/reflect/.*$:) {return '118';}
-if (m:^mozilla/mailnews/news/.*$:) {return '122';}
 }
 if ($b eq 'NSPRPUB_PRE_4_2_CLIENT_BRANCH') {
 if (m:^mozilla/nsprpub/.*$:) {return '146';}
diff --git a/CVSROOT/passwd b/CVSROOT/passwd
index 3f9d3cbd37b..d9d92de25b9 100644
--- a/CVSROOT/passwd
+++ b/CVSROOT/passwd
@@ -50,7 +50,6 @@ bstell%ix.netcom.com:/ZdK7gz9SA/RU:cvsuser
 bugreport%peshkin.net:PgnY246SzUcHk:cvsuser
 bugzilla%arlen.demon.co.uk:bVhEvG7dtzxWg:cvsuser
 bugzilla%glob.com.au:O.LFwfIctGxh6:cvsuser
-bugzilla%micropipes.com:7kMqx9pigCvx2:cvsuser
 bugzilla%standard8.demon.co.uk:lmzqmqShGzGYs:cvsuser
 burnus%gmx.de:RBozBY9sekJRM:cvsuser
 bz%barnson.org:hRMbA3bW5q6Ak:cvsuser
@@ -340,6 +339,7 @@ varada%netscape.com:/PHzlvLt1d/Pk:cvsuser
 vitaly%rathedg.com:gCpWN92cgp7aU:cvsuser
 vladimir%pobox.com:ZcFYwCPC7dvjE:cvsuser
 wade%ezri.org:FeXuLzEvXT132:cvsuser
+wclouser%mozilla.com:7kMqx9pigCvx2:cvsuser
 webmail%kmgerich.com:K7U1HCAoxFv2E:cvsuser
 wolfe%lobo.us:lv89GmGhY7/16:cvsuser
 wr%rosenauer.org:ZfCN63R6WKPWc:cvsuser