diff --git a/CVSROOT/commitcheck.pl b/CVSROOT/commitcheck.pl
index f8527803434..6c0a48dba6e 100755
--- a/CVSROOT/commitcheck.pl
+++ b/CVSROOT/commitcheck.pl
@@ -326,68 +326,6 @@ if ($b eq 'BUGZILLA-3_2-BRANCH') {
 if (m:^mozilla/webtools/bugzilla/.*$:) {return '217';}
 }
 if ($b eq 'HEAD') {
-if (m:^mozilla/webtools/partytool/.*$:) {return '209';}
-if (m:^mozilla/js/tests/.*$:) {return '114';}
-if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
-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/layout/mathml/.*$:) {return '165';}
-if (m:^mozilla/rdf/.*$:) {return '52';}
-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/build/.*$:) {return '55';}
-if (m:^mozilla/config/.*$:) {return '55';}
-if (m:^mozilla/tools/cross-commit$:) {return '55';}
-if (m:^mozilla/tools/cvs2hg-import\.py$:) {return '55';}
-if (m:^mozilla/tools/cvsmgmt/.*$:) {return '55';}
-if (m:^mozilla/tools/elf-dynstr-gc/.*$:) {return '55';}
-if (m:^mozilla/tools/relic/.*$:) {return '55';}
-if (m:^mozilla/tools/trees\.pl$:) {return '55';}
-if (m:^mozilla/calendar/.*$:) {return '183';}
-if (m:^mozilla/chrome/.*$:) {return '169';}
-if (m:^mozilla/toolkit/.*$:) {return '169';}
-if (m:^mozilla/xulrunner/.*$:) {return '169';}
-if (m:^mozilla/editor/.*$:) {return '56';}
-if (m:^mozilla/gfx/src/photon/.*$:) {return '113';}
-if (m:^mozilla/widget/src/photon/.*$:) {return '113';}
-if (m:^mozilla/mail/.*$:) {return '170';}
-if (m:^mozilla/other-licenses/branding/thunderbird/.*$:) {return '170';}
-if (m:^mozilla/directory/.*$:) {return '59';}
-if (m:^mozilla/content/xul/.*$:) {return '106';}
-if (m:^mozilla/layout/xul/.*$:) {return '106';}
-if (m:^mozilla/extensions/cookie/.*$:) {return '171';}
-if (m:^mozilla/netwerk/cookie/.*$:) {return '171';}
-if (m:^mozilla/jpeg/.*$:) {return '63';}
-if (m:^mozilla/modules/libimg/png/.*$:) {return '63';}
-if (m:^mozilla/modules/libpr0n/.*$:) {return '63';}
-if (m:^mozilla/modules/zlib/.*$:) {return '63';}
-if (m:^mozilla/testing/.*$:) {return '202';}
-if (m:^mozilla/tools/httptester/.*$:) {return '202';}
-if (m:^mozilla/tools/page-loader/.*$:) {return '202';}
-if (m:^mozilla/tools/test-harness/.*$:) {return '202';}
-if (m:^mozilla/tools/tests/.*$:) {return '202';}
-if (m:^mozilla/tools/testserver/.*$:) {return '202';}
-if (m:^mozilla/tools/testy/.*$:) {return '202';}
-if (m:^mozilla/widget/src/beos/.*$:) {return '172';}
-if (m:^mozilla/extensions/irc/.*$:) {return '211';}
-if (m:^mozilla/tools/botrunner\.py$:) {return '214';}
-if (m:^mozilla/tools/build-environment/.*$:) {return '214';}
-if (m:^mozilla/tools/build/.*$:) {return '214';}
-if (m:^mozilla/tools/buildbot-configs/.*$:) {return '214';}
-if (m:^mozilla/tools/buildbot/.*$:) {return '214';}
-if (m:^mozilla/tools/buildbotcustom/.*$:) {return '214';}
-if (m:^mozilla/tools/l10n/.*$:) {return '214';}
-if (m:^mozilla/tools/MozBuild/.*$:) {return '214';}
-if (m:^mozilla/tools/patcher-configs/.*$:) {return '214';}
-if (m:^mozilla/tools/patcher/.*$:) {return '214';}
-if (m:^mozilla/tools/release/.*$:) {return '214';}
-if (m:^mozilla/tools/tinderbox-configs/.*$:) {return '214';}
-if (m:^mozilla/tools/tinderbox/.*$:) {return '214';}
-if (m:^mozilla/tools/update-packaging/.*$:) {return '214';}
 if (m:^mozilla/intl/.*$:) {return '67';}
 if (m:^mozilla/profile/.*$:) {return '120';}
 if (m:^mozilla/widget/src/windows/.*$:) {return '175';}
@@ -515,16 +453,18 @@ 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:^CVSROOT/commitcheck\.pl$:) {return '3';}
-if (m:^CVSROOT/passwd$:) {return '3';}
 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/local/src/nsMovemail.*$:) {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';}
@@ -532,9 +472,6 @@ if (m:^mozilla/security/jss/.*$:) {return '145';}
 if (m:^mozilla/security/nss/.*$:) {return '145';}
 if (m:^mozilla/security/tinderbox/.*$:) {return '145';}
 if (m:^mozilla/security/tinderlight/.*$:) {return '145';}
-if (m:^mozilla/parser/htmlparser$:) {return '102';}
-if (m:^mozilla/embedding/.*$:) {return '208';}
-if (m:^mozilla/composer/.*$:) {return '173';}
 if (m:^mozilla/content/base/.*$:) {return '103';}
 if (m:^mozilla/content/events/.*$:) {return '103';}
 if (m:^mozilla/content/html/content/.*$:) {return '103';}
@@ -542,15 +479,78 @@ 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/[^/]*$:) {return '19';}
-if (m:^mozilla/tools/README$:) {return '19';}
+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/xpfe/.*$:) {return '137';}
+if (m:^mozilla/js/tests/.*$:) {return '114';}
+if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
+if (m:^mozilla/webtools/partytool/.*$:) {return '209';}
+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/layout/mathml/.*$:) {return '165';}
+if (m:^mozilla/rdf/.*$:) {return '52';}
+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/build/.*$:) {return '55';}
+if (m:^mozilla/config/.*$:) {return '55';}
+if (m:^mozilla/tools/cross-commit$:) {return '55';}
+if (m:^mozilla/tools/cvs2hg-import\.py$:) {return '55';}
+if (m:^mozilla/tools/cvsmgmt/.*$:) {return '55';}
+if (m:^mozilla/tools/elf-dynstr-gc/.*$:) {return '55';}
+if (m:^mozilla/tools/relic/.*$:) {return '55';}
+if (m:^mozilla/tools/trees\.pl$:) {return '55';}
+if (m:^mozilla/calendar/.*$:) {return '183';}
+if (m:^mozilla/chrome/.*$:) {return '169';}
+if (m:^mozilla/toolkit/.*$:) {return '169';}
+if (m:^mozilla/xulrunner/.*$:) {return '169';}
+if (m:^mozilla/editor/.*$:) {return '56';}
+if (m:^mozilla/gfx/src/photon/.*$:) {return '113';}
+if (m:^mozilla/widget/src/photon/.*$:) {return '113';}
+if (m:^mozilla/mail/.*$:) {return '170';}
+if (m:^mozilla/other-licenses/branding/thunderbird/.*$:) {return '170';}
+if (m:^mozilla/directory/.*$:) {return '59';}
+if (m:^mozilla/content/xul/.*$:) {return '106';}
+if (m:^mozilla/layout/xul/.*$:) {return '106';}
+if (m:^mozilla/extensions/cookie/.*$:) {return '171';}
+if (m:^mozilla/netwerk/cookie/.*$:) {return '171';}
+if (m:^mozilla/jpeg/.*$:) {return '63';}
+if (m:^mozilla/modules/libimg/png/.*$:) {return '63';}
+if (m:^mozilla/modules/libpr0n/.*$:) {return '63';}
+if (m:^mozilla/modules/zlib/.*$:) {return '63';}
+if (m:^mozilla/testing/.*$:) {return '202';}
+if (m:^mozilla/tools/httptester/.*$:) {return '202';}
+if (m:^mozilla/tools/page-loader/.*$:) {return '202';}
+if (m:^mozilla/tools/test-harness/.*$:) {return '202';}
+if (m:^mozilla/tools/tests/.*$:) {return '202';}
+if (m:^mozilla/tools/testserver/.*$:) {return '202';}
+if (m:^mozilla/tools/testy/.*$:) {return '202';}
+if (m:^mozilla/widget/src/beos/.*$:) {return '172';}
+if (m:^mozilla/extensions/irc/.*$:) {return '211';}
+if (m:^mozilla/tools/botrunner\.py$:) {return '214';}
+if (m:^mozilla/tools/build-environment/.*$:) {return '214';}
+if (m:^mozilla/tools/build/.*$:) {return '214';}
+if (m:^mozilla/tools/buildbot-configs/.*$:) {return '214';}
+if (m:^mozilla/tools/buildbot/.*$:) {return '214';}
+if (m:^mozilla/tools/buildbotcustom/.*$:) {return '214';}
+if (m:^mozilla/tools/l10n/.*$:) {return '214';}
+if (m:^mozilla/tools/MozBuild/.*$:) {return '214';}
+if (m:^mozilla/tools/patcher-configs/.*$:) {return '214';}
+if (m:^mozilla/tools/patcher/.*$:) {return '214';}
+if (m:^mozilla/tools/release/.*$:) {return '214';}
+if (m:^mozilla/tools/tinderbox-configs/.*$:) {return '214';}
+if (m:^mozilla/tools/tinderbox/.*$:) {return '214';}
+if (m:^mozilla/tools/update-packaging/.*$:) {return '214';}
 }
 if ($b eq 'NSPRPUB_PRE_4_2_CLIENT_BRANCH') {
 if (m:^mozilla/nsprpub/.*$:) {return '146';}
diff --git a/CVSROOT/passwd b/CVSROOT/passwd
index fd3fba8f72b..c9a3270f7d4 100644
--- a/CVSROOT/passwd
+++ b/CVSROOT/passwd
@@ -65,7 +65,6 @@ cpeyer%adobe.com:/J3KHO2IWNqBk:cvsuser
 crowder%fiverocks.com:nTJiASZEqtksI:cvsuser
 cst%yecc.com:FsXA0AnQhG/kg:cvsuser
 ctalbert%mozilla.com:9UNADg/pEZyzA:cvsuser
-daniel.boelzle%sun.com:IhnkPcmU2aaTM:cvsuser
 daniel%glazman.org:voZRrCYpgF9AU:cvsuser
 danm-moz%comcast.net:3h6FdkzmMqnyA:cvsuser
 dansmith%adobe.com:XXuMiHbfmTlRQ:cvsuser
@@ -212,6 +211,7 @@ morgamic%mozilla.com:oMf2l.pEwcLAc:cvsuser
 mostafah%oeone.com:DaYs.xDcUaa72:cvsuser
 mozilla.BenB%bucksch.org:7/oOTh8e41HmY:cvsuser
 mozilla.mano%sent.com:rXnDyx.hnVKyk:cvsuser
+mozilla%boelzle.org:IhnkPcmU2aaTM:cvsuser
 mozilla%colinogilvie.co.uk:JlBNqlkELDhhI:cvsuser
 mozilla%justcameron.com:eCz/XDzlP8Cwg:cvsuser
 mozilla%kewis.ch:K/pXr12MlfCWc:cvsuser