diff --git a/CVSROOT/commitcheck.pl b/CVSROOT/commitcheck.pl
index c4d193c2b9a..b76a8f47b3c 100755
--- a/CVSROOT/commitcheck.pl
+++ b/CVSROOT/commitcheck.pl
@@ -184,7 +184,7 @@ $mode{'163'} = 'Restricted';
 $branch{'163'} = 'NSS_3_3_BRANCH';
 $fullname{'163'} = 'NSS Stable Release Branch';
 $blessed{'163'} = [];
-$super{'163'} = ['tfox%netscape.com','nicolson%netscape.com','nelsonb%netscape.com','jpierre%netscape.com','ian.mcgreer%sun.com','glen.beasley%sun.com','bishakhabanerjee%netscape.com','wchang0222%aol.com','relyea%netscape.com',];
+$super{'163'} = ['tfox%netscape.com','nicolson%netscape.com','nelsonb%netscape.com','julien.pierre.bugs%sun.com','ian.mcgreer%sun.com','glen.beasley%sun.com','bishakhabanerjee%netscape.com','wchang0222%aol.com','relyea%netscape.com',];
 $mode{'159'} = 'Open';
 $branch{'159'} = 'HEAD';
 $fullname{'159'} = 'NSS Trunk';
@@ -225,7 +225,7 @@ $mode{'145'} = 'Restricted';
 $branch{'145'} = 'HEAD';
 $fullname{'145'} = 'security';
 $blessed{'145'} = ['jgmyers%speakeasy.net','gerv%gerv.net','cotter%netscape.com','cls%seawood.org','bryner%brianryner.com',];
-$super{'145'} = ['wchang0222%aol.com','tfox%netscape.com','saul.edwards%sun.com','nicolson%netscape.com','nelsonb%netscape.com','kaie%kuix.de','jpierre%netscape.com','ian.mcgreer%sun.com','glen.beasley%sun.com','christophe.ravel.bugs%sun.com','chrisk%netscape.com','bishakhabanerjee%netscape.com','thayes%netscape.com','relyea%netscape.com','ddrinan%netscape.com',];
+$super{'145'} = ['wchang0222%aol.com','tfox%netscape.com','saul.edwards%sun.com','nicolson%netscape.com','nelsonb%netscape.com','kaie%kuix.de','julien.pierre.bugs%sun.com','ian.mcgreer%sun.com','glen.beasley%sun.com','christophe.ravel.bugs%sun.com','chrisk%netscape.com','bishakhabanerjee%netscape.com','thayes%netscape.com','relyea%netscape.com','ddrinan%netscape.com',];
 $mode{'151'} = 'Open';
 $branch{'151'} = 'HEAD';
 $fullname{'151'} = 'Security - Mozilla PSM Glue';
@@ -310,30 +310,6 @@ $fullname{'93'} = 'Zlib';
 sub GetT {
 ($b,$_) = (@_);
 if ($b eq 'HEAD') {
-if (m:^mozilla/xpcom/.*$:) {return '89';}
-if (m:^xpcom/io$:) {return '90';}
-if (m:^mozilla/modules/zlib/.*$:) {return '93';}
-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/html/.*$:) {return '98';}
-if (m:^mozilla/layout/macbuild/.*$:) {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/content/html/style/.*$:) {return '100';}
-if (m:^mozilla/content/shared/.*$:) {return '100';}
-if (m:^mozilla/embedding/.*$:) {return '101';}
-if (m:^mozilla/webshell/.*$:) {return '101';}
-if (m:^mozilla/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';}
@@ -452,6 +428,30 @@ if (m:^mozilla/modules/softupdt/.*$:) {return '87';}
 if (m:^mozilla/content/xml/.*$:) {return '88';}
 if (m:^mozilla/expat/.*$:) {return '88';}
 if (m:^mozilla/extensions/xmlextras/.*$:) {return '88';}
+if (m:^mozilla/xpcom/.*$:) {return '89';}
+if (m:^xpcom/io$:) {return '90';}
+if (m:^mozilla/modules/zlib/.*$:) {return '93';}
+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/html/.*$:) {return '98';}
+if (m:^mozilla/layout/macbuild/.*$:) {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/content/html/style/.*$:) {return '100';}
+if (m:^mozilla/content/shared/.*$:) {return '100';}
+if (m:^mozilla/embedding/.*$:) {return '101';}
+if (m:^mozilla/webshell/.*$:) {return '101';}
+if (m:^mozilla/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 30bc507b1a3..02cac31474b 100644
--- a/CVSROOT/passwd
+++ b/CVSROOT/passwd
@@ -159,12 +159,12 @@ john%johnkeiser.com:UEgKBivGIzptw:cvsuser
 joshmoz%gmail.com:X9Pi3H9iwCIb2:cvsuser
 joshua.xia%bea.com:qK5Olug74ZkBI:cvsuser
 jouni%heikniemi.net:ykttS9UKWXc9E:cvsuser
-jpierre%netscape.com:2ebjC0cACURyU:cvsuser
 jrgm%netscape.com:3ix9Y5PU9Qruw:cvsuser
 jruderman%hmc.edu:mwr0yF3PJ5H2g:cvsuser
 jshin%mailaps.org:j6/TcPcy/KYgg:cvsuser
 jst%mozilla.jstenback.com:ry1WSdsxrYVhg:cvsuser
 jsun%netscape.com:coq.3Xx7ARTjs:cvsuser
+julien.pierre.bugs%sun.com:2ebjC0cACURyU:cvsuser
 justdave%bugzilla.org:gH/q.1W.wLBGQ:cvsadm
 jwalden%mit.edu:DYcaTEuBX5WEA:cvsuser
 kaie%kuix.de:.hgVIsvtes.Fw:cvsuser