diff --git a/CVS/Entries b/CVS/Entries
index f7c69ddb61ac3fa4815fa0dc84e706c568c2b43c..b6435a819c4bc9652177f95b29241e709e92cea6 100644
--- a/CVS/Entries
+++ b/CVS/Entries
@@ -1,78 +1,78 @@
-/.cvsignore/1.5.2.1/Mon May 13 22:31:47 2002//TBUGZILLA-2_16_1
-/1x1.gif/1.1/Wed Aug 26 06:14:15 1998/-kb/TBUGZILLA-2_16_1
-/Attachment.pm/1.8/Sat Mar 23 17:58:36 2002//TBUGZILLA-2_16_1
-/Bug.pm/1.12/Sat Apr 27 06:25:41 2002//TBUGZILLA-2_16_1
-/CGI.pl/1.153.2.3/Wed Jul 10 06:27:15 2002//TBUGZILLA-2_16_1
-/README/1.50/Sat Aug 11 19:56:40 2001//TBUGZILLA-2_16_1
-/RelationSet.pm/1.7/Sat Nov  3 02:05:43 2001//TBUGZILLA-2_16_1
-/Token.pm/1.12.2.1/Tue Jul  9 02:17:28 2002//TBUGZILLA-2_16_1
-/UPGRADING/1.1/Fri Aug 10 22:35:21 2001//TBUGZILLA-2_16_1
-/UPGRADING-pre-2.8/1.2/Sun Dec 23 23:23:22 2001//TBUGZILLA-2_16_1
-/ant.jpg/1.2/Wed Aug 26 22:36:05 1998/-kb/TBUGZILLA-2_16_1
-/attachment.cgi/1.14/Wed Apr 24 07:24:43 2002//TBUGZILLA-2_16_1
-/bug_form.pl/1.93.2.3/Wed Jul 10 00:05:51 2002//TBUGZILLA-2_16_1
-/bug_status.html/1.13/Mon Apr 15 02:47:52 2002//TBUGZILLA-2_16_1
-/buglist.cgi/1.169.2.10/Wed Jun 19 22:53:25 2002//TBUGZILLA-2_16_1
-/bugwritinghelp.html/1.3/Mon Apr 15 02:47:53 2002//TBUGZILLA-2_16_1
-/bugzilla.dtd/1.5/Thu Apr  4 04:19:58 2002//TBUGZILLA-2_16_1
-/changepassword.cgi/1.21/Sun Jan 20 01:44:37 2002//TBUGZILLA-2_16_1
-/checksetup.pl/1.149.2.11/Wed Aug 14 23:32:04 2002//TBUGZILLA-2_16_1
-/colchange.cgi/1.24.2.2/Mon Jun 17 09:39:35 2002//TBUGZILLA-2_16_1
-/collectstats.pl/1.20/Wed Jun  6 21:17:40 2001//TBUGZILLA-2_16_1
-/confirmhelp.html/1.3/Mon Apr 15 02:47:53 2002//TBUGZILLA-2_16_1
-/createaccount.cgi/1.21.2.3/Fri Aug 30 15:29:24 2002//TBUGZILLA-2_16_1
-/defparams.pl/1.73.2.2/Wed Jul 10 00:05:52 2002//TBUGZILLA-2_16_1
-/describecomponents.cgi/1.11.2.2/Mon Jun 17 09:39:40 2002//TBUGZILLA-2_16_1
-/describekeywords.cgi/1.8/Wed Apr 24 07:24:45 2002//TBUGZILLA-2_16_1
-/doeditparams.cgi/1.17.2.1/Mon Jun 17 09:39:40 2002//TBUGZILLA-2_16_1
-/duplicates.cgi/1.19/Fri Apr 26 23:18:57 2002//TBUGZILLA-2_16_1
-/editattachstatuses.cgi/1.7/Mon Apr 29 19:32:27 2002//TBUGZILLA-2_16_1
-/editcomponents.cgi/1.22.2.2/Mon Jun 17 09:39:41 2002//TBUGZILLA-2_16_1
-/editgroups.cgi/1.16.2.1/Mon Jun 17 09:39:41 2002//TBUGZILLA-2_16_1
-/editkeywords.cgi/1.9.2.1/Mon Jun 17 09:39:42 2002//TBUGZILLA-2_16_1
-/editmilestones.cgi/1.8.2.1/Mon Jun 17 09:39:42 2002//TBUGZILLA-2_16_1
-/editparams.cgi/1.14.2.1/Mon Jun 17 09:39:42 2002//TBUGZILLA-2_16_1
-/editproducts.cgi/1.24.2.2/Sun Sep 22 17:47:12 2002//TBUGZILLA-2_16_1
-/editusers.cgi/1.35.2.2/Mon Jun 17 09:39:44 2002//TBUGZILLA-2_16_1
-/editversions.cgi/1.11.2.1/Mon Jun 17 09:39:44 2002//TBUGZILLA-2_16_1
-/enter_bug.cgi/1.66.2.3/Tue Jun 11 13:33:45 2002//TBUGZILLA-2_16_1
-/globals.pl/1.169.2.12/Sat Sep 28 23:54:50 2002//TBUGZILLA-2_16_1
-/help.html/1.5/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_1
-/helpemailquery.html/1.2/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_1
-/how_to_mail.html/1.3/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_1
-/importxml.pl/1.23.2.1/Sun Aug 25 16:50:08 2002//TBUGZILLA-2_16_1
-/index.cgi/1.4.2.1/Sun Jun 23 17:36:00 2002//TBUGZILLA-2_16_1
-/localconfig.js/1.1/Wed Feb 28 23:07:25 2001//TBUGZILLA-2_16_1
-/long_list.cgi/1.26/Wed Apr 24 07:24:46 2002//TBUGZILLA-2_16_1
-/move.pl/1.11.2.1/Mon Jun 17 09:39:48 2002//TBUGZILLA-2_16_1
-/notargetmilestone.html/1.3/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_1
-/post_bug.cgi/1.52.2.6/Thu Aug  1 09:59:32 2002//TBUGZILLA-2_16_1
-/process_bug.cgi/1.125.2.6/Tue Sep  3 07:24:54 2002//TBUGZILLA-2_16_1
-/processmail/1.81/Sun Apr 14 04:43:55 2002//TBUGZILLA-2_16_1
-/query.cgi/1.98.2.1/Mon Jun  3 01:42:15 2002//TBUGZILLA-2_16_1
-/queryhelp.cgi/1.11.2.2/Mon Jun 17 09:39:45 2002//TBUGZILLA-2_16_1
-/quicksearch.html/1.3/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_1
-/quicksearch.js/1.9/Mon Dec 24 22:24:35 2001//TBUGZILLA-2_16_1
-/quicksearchhack.html/1.4/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_1
-/quips.cgi/1.6.2.1/Mon Jun 17 09:39:46 2002//TBUGZILLA-2_16_1
-/relogin.cgi/1.18/Wed May  8 04:40:35 2002//TBUGZILLA-2_16_1
-/reports.cgi/1.54/Fri Apr 26 21:09:50 2002//TBUGZILLA-2_16_1
-/robots.txt/1.2/Wed Apr 24 18:11:00 2002//TBUGZILLA-2_16_1
-/runtests.sh/1.5/Fri Apr 12 21:15:45 2002//TBUGZILLA-2_16_1
-/sanitycheck.cgi/1.42/Thu Apr  4 04:19:58 2002//TBUGZILLA-2_16_1
-/show_activity.cgi/1.9/Wed Apr 24 07:24:49 2002//TBUGZILLA-2_16_1
-/show_bug.cgi/1.18/Sat Mar 23 17:58:36 2002//TBUGZILLA-2_16_1
-/showattachment.cgi/1.10/Wed Jan 30 14:14:12 2002//TBUGZILLA-2_16_1
-/showdependencygraph.cgi/1.18.2.1/Tue Jul  9 23:40:41 2002//TBUGZILLA-2_16_1
-/showdependencytree.cgi/1.17.2.1/Tue May 21 14:18:00 2002//TBUGZILLA-2_16_1
-/sidebar.cgi/1.4.2.2/Wed Jul 10 00:05:54 2002//TBUGZILLA-2_16_1
-/syncshadowdb/1.14/Sun Dec 23 23:23:22 2001//TBUGZILLA-2_16_1
-/token.cgi/1.7.2.1/Mon Jun 17 09:39:46 2002//TBUGZILLA-2_16_1
-/userprefs.cgi/1.35.2.3/Tue Aug 13 06:57:00 2002//TBUGZILLA-2_16_1
-/votehelp.html/1.10/Mon Apr 15 02:47:56 2002//TBUGZILLA-2_16_1
-/votes.cgi/1.3/Tue May  7 21:28:41 2002//TBUGZILLA-2_16_1
-/whineatnews.pl/1.7/Sun Feb 17 08:22:31 2002//TBUGZILLA-2_16_1
-/xml.cgi/1.6.2.1/Mon Jun 17 09:39:48 2002//TBUGZILLA-2_16_1
+/.cvsignore/1.5.2.1/Mon May 13 22:31:47 2002//TBUGZILLA-2_16_2
+/1x1.gif/1.1/Wed Aug 26 06:14:15 1998/-kb/TBUGZILLA-2_16_2
+/Attachment.pm/1.8/Sat Mar 23 17:58:36 2002//TBUGZILLA-2_16_2
+/Bug.pm/1.12/Sat Apr 27 06:25:41 2002//TBUGZILLA-2_16_2
+/CGI.pl/1.153.2.3/Wed Jul 10 06:27:15 2002//TBUGZILLA-2_16_2
+/README/1.50/Sat Aug 11 19:56:40 2001//TBUGZILLA-2_16_2
+/RelationSet.pm/1.7/Sat Nov  3 02:05:43 2001//TBUGZILLA-2_16_2
+/Token.pm/1.12.2.1/Tue Jul  9 02:17:28 2002//TBUGZILLA-2_16_2
+/UPGRADING/1.1/Fri Aug 10 22:35:21 2001//TBUGZILLA-2_16_2
+/UPGRADING-pre-2.8/1.2/Sun Dec 23 23:23:22 2001//TBUGZILLA-2_16_2
+/ant.jpg/1.2/Wed Aug 26 22:36:05 1998/-kb/TBUGZILLA-2_16_2
+/attachment.cgi/1.14/Wed Apr 24 07:24:43 2002//TBUGZILLA-2_16_2
+/bug_form.pl/1.93.2.3/Wed Jul 10 00:05:51 2002//TBUGZILLA-2_16_2
+/bug_status.html/1.13/Mon Apr 15 02:47:52 2002//TBUGZILLA-2_16_2
+/buglist.cgi/1.169.2.10/Wed Jun 19 22:53:25 2002//TBUGZILLA-2_16_2
+/bugwritinghelp.html/1.3/Mon Apr 15 02:47:53 2002//TBUGZILLA-2_16_2
+/bugzilla.dtd/1.5/Thu Apr  4 04:19:58 2002//TBUGZILLA-2_16_2
+/changepassword.cgi/1.21/Sun Jan 20 01:44:37 2002//TBUGZILLA-2_16_2
+/checksetup.pl/1.149.2.14/Mon Dec 23 01:54:23 2002//TBUGZILLA-2_16_2
+/colchange.cgi/1.24.2.2/Mon Jun 17 09:39:35 2002//TBUGZILLA-2_16_2
+/collectstats.pl/1.20.12.1/Fri Dec 13 11:02:26 2002//TBUGZILLA-2_16_2
+/confirmhelp.html/1.3/Mon Apr 15 02:47:53 2002//TBUGZILLA-2_16_2
+/createaccount.cgi/1.21.2.3/Fri Aug 30 15:29:24 2002//TBUGZILLA-2_16_2
+/defparams.pl/1.73.2.2/Wed Jul 10 00:05:52 2002//TBUGZILLA-2_16_2
+/describecomponents.cgi/1.11.2.2/Mon Jun 17 09:39:40 2002//TBUGZILLA-2_16_2
+/describekeywords.cgi/1.8/Wed Apr 24 07:24:45 2002//TBUGZILLA-2_16_2
+/doeditparams.cgi/1.17.2.1/Mon Jun 17 09:39:40 2002//TBUGZILLA-2_16_2
+/duplicates.cgi/1.19/Fri Apr 26 23:18:57 2002//TBUGZILLA-2_16_2
+/editattachstatuses.cgi/1.7/Mon Apr 29 19:32:27 2002//TBUGZILLA-2_16_2
+/editcomponents.cgi/1.22.2.2/Mon Jun 17 09:39:41 2002//TBUGZILLA-2_16_2
+/editgroups.cgi/1.16.2.1/Mon Jun 17 09:39:41 2002//TBUGZILLA-2_16_2
+/editkeywords.cgi/1.9.2.1/Mon Jun 17 09:39:42 2002//TBUGZILLA-2_16_2
+/editmilestones.cgi/1.8.2.1/Mon Jun 17 09:39:42 2002//TBUGZILLA-2_16_2
+/editparams.cgi/1.14.2.1/Mon Jun 17 09:39:42 2002//TBUGZILLA-2_16_2
+/editproducts.cgi/1.24.2.2/Sun Sep 22 17:47:12 2002//TBUGZILLA-2_16_2
+/editusers.cgi/1.35.2.2/Mon Jun 17 09:39:44 2002//TBUGZILLA-2_16_2
+/editversions.cgi/1.11.2.1/Mon Jun 17 09:39:44 2002//TBUGZILLA-2_16_2
+/enter_bug.cgi/1.66.2.3/Tue Jun 11 13:33:45 2002//TBUGZILLA-2_16_2
+/globals.pl/1.169.2.13/Fri Dec 13 11:30:38 2002//TBUGZILLA-2_16_2
+/help.html/1.5/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_2
+/helpemailquery.html/1.2/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_2
+/how_to_mail.html/1.3/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_2
+/importxml.pl/1.23.2.1/Sun Aug 25 16:50:08 2002//TBUGZILLA-2_16_2
+/index.cgi/1.4.2.1/Sun Jun 23 17:36:00 2002//TBUGZILLA-2_16_2
+/localconfig.js/1.1/Wed Feb 28 23:07:25 2001//TBUGZILLA-2_16_2
+/long_list.cgi/1.26/Wed Apr 24 07:24:46 2002//TBUGZILLA-2_16_2
+/move.pl/1.11.2.1/Mon Jun 17 09:39:48 2002//TBUGZILLA-2_16_2
+/notargetmilestone.html/1.3/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_2
+/post_bug.cgi/1.52.2.6/Thu Aug  1 09:59:32 2002//TBUGZILLA-2_16_2
+/process_bug.cgi/1.125.2.6/Tue Sep  3 07:24:54 2002//TBUGZILLA-2_16_2
+/processmail/1.81/Sun Apr 14 04:43:55 2002//TBUGZILLA-2_16_2
+/query.cgi/1.98.2.1/Mon Jun  3 01:42:15 2002//TBUGZILLA-2_16_2
+/queryhelp.cgi/1.11.2.2/Mon Jun 17 09:39:45 2002//TBUGZILLA-2_16_2
+/quicksearch.html/1.3/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_2
+/quicksearch.js/1.9/Mon Dec 24 22:24:35 2001//TBUGZILLA-2_16_2
+/quicksearchhack.html/1.4/Mon Apr 15 02:47:55 2002//TBUGZILLA-2_16_2
+/quips.cgi/1.6.2.1/Mon Jun 17 09:39:46 2002//TBUGZILLA-2_16_2
+/relogin.cgi/1.18/Wed May  8 04:40:35 2002//TBUGZILLA-2_16_2
+/reports.cgi/1.54/Fri Apr 26 21:09:50 2002//TBUGZILLA-2_16_2
+/robots.txt/1.2/Wed Apr 24 18:11:00 2002//TBUGZILLA-2_16_2
+/runtests.sh/1.5/Fri Apr 12 21:15:45 2002//TBUGZILLA-2_16_2
+/sanitycheck.cgi/1.42/Thu Apr  4 04:19:58 2002//TBUGZILLA-2_16_2
+/show_activity.cgi/1.9/Wed Apr 24 07:24:49 2002//TBUGZILLA-2_16_2
+/show_bug.cgi/1.18/Sat Mar 23 17:58:36 2002//TBUGZILLA-2_16_2
+/showattachment.cgi/1.10/Wed Jan 30 14:14:12 2002//TBUGZILLA-2_16_2
+/showdependencygraph.cgi/1.18.2.1/Tue Jul  9 23:40:41 2002//TBUGZILLA-2_16_2
+/showdependencytree.cgi/1.17.2.1/Tue May 21 14:18:00 2002//TBUGZILLA-2_16_2
+/sidebar.cgi/1.4.2.2/Wed Jul 10 00:05:54 2002//TBUGZILLA-2_16_2
+/syncshadowdb/1.14/Sun Dec 23 23:23:22 2001//TBUGZILLA-2_16_2
+/token.cgi/1.7.2.1/Mon Jun 17 09:39:46 2002//TBUGZILLA-2_16_2
+/userprefs.cgi/1.35.2.3/Tue Aug 13 06:57:00 2002//TBUGZILLA-2_16_2
+/votehelp.html/1.10/Mon Apr 15 02:47:56 2002//TBUGZILLA-2_16_2
+/votes.cgi/1.3/Tue May  7 21:28:41 2002//TBUGZILLA-2_16_2
+/whineatnews.pl/1.7/Sun Feb 17 08:22:31 2002//TBUGZILLA-2_16_2
+/xml.cgi/1.6.2.1/Mon Jun 17 09:39:48 2002//TBUGZILLA-2_16_2
 D/contrib////
 D/css////
 D/docs////
diff --git a/CVS/Entries.Log b/CVS/Entries.Log
index 7bc9f41d7dc5abf7e052f90de56b219a10bf3e7d..e678de311cbb10c1d63d72acab1181c5511dae90 100644
--- a/CVS/Entries.Log
+++ b/CVS/Entries.Log
@@ -1,6 +1,12 @@
 A D/Bugzilla////
 A D/Conf////
+A D/DiffPrinter////
+A D/PatchIterator////
+A D/js////
 A D/oracle////
 R D/oracle////
+R D/js////
+R D/PatchIterator////
+R D/DiffPrinter////
 R D/Conf////
 R D/Bugzilla////
diff --git a/CVS/Tag b/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/CVS/Tag
+++ b/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/checksetup.pl b/checksetup.pl
index 4d3c1e15879cf632f39ae12a92e862a6d5354baf..fd2ffa33705d9a6e7e9348f25f9d44d32e0d64a9 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -754,12 +754,35 @@ if ($my_create_htaccess) {
     open HTACCESS, ">.htaccess";
     print HTACCESS <<'END';
 # don't allow people to retrieve non-cgi executable files or our private data
-<FilesMatch ^(.*\.pl|localconfig|processmail|syncshadowdb|runtests.sh)$>
+<FilesMatch ^(.*\.pl|.*localconfig.*|processmail|syncshadowdb|runtests.sh)$>
   deny from all
 </FilesMatch>
+<FilesMatch ^(localconfig.js|localconfig.rdf)$>
+  allow from all
+</FilesMatch>
 END
     close HTACCESS;
     chmod $fileperm, ".htaccess";
+  } else {
+    # 2002-12-21 Bug 186383
+    open HTACCESS, ".htaccess";
+    my $oldaccess = "";
+    while (<HTACCESS>) {
+      $oldaccess .= $_;
+    }
+    close HTACCESS;
+    if ($oldaccess =~ s/\|localconfig\|/\|.*localconfig.*\|/) {
+      print "Repairing .htaccess...\n";
+      open HTACCESS, ">.htaccess";
+      print HTACCESS $oldaccess;
+      print HTACCESS <<'END';
+<FilesMatch ^(localconfig.js|localconfig.rdf)$>
+  allow from all
+</FilesMatch>
+END
+      close HTACCESS;
+    }
+
   }
   if (!-e "data/.htaccess") {
     print "Creating data/.htaccess...\n";
diff --git a/collectstats.pl b/collectstats.pl
index 4e69ab9b5fb123b140282abb036078bba6ca4b71..2a29bb9f5c4ef1b2e826c731dd2deec1d08751ba 100755
--- a/collectstats.pl
+++ b/collectstats.pl
@@ -57,7 +57,7 @@ foreach (@myproducts) {
 sub check_data_dir {
     my $dir = shift;
 
-    if (! -d) {
+    if (! -d $dir) {
         mkdir $dir, 0777;
         chmod 0777, $dir;
     }
diff --git a/contrib/CVS/Entries b/contrib/CVS/Entries
index c11c48df09bc75ab0c44ad3c6a078cdb4f2ac43a..b9ee68a43c72f40cfec6090430fe59515e3b603e 100644
--- a/contrib/CVS/Entries
+++ b/contrib/CVS/Entries
@@ -1,13 +1,13 @@
-/BugzillaEmail.pm/1.1/Wed Mar 15 22:29:44 2000//TBUGZILLA-2_16_1
-/README/1.4/Sun Apr 22 18:13:40 2001//TBUGZILLA-2_16_1
-/README.Mailif/1.3/Wed Mar 15 23:39:03 2000//TBUGZILLA-2_16_1
-/bug_email.pl/1.9.12.2/Sat Aug 17 14:24:09 2002//TBUGZILLA-2_16_1
-/bugmail_help.html/1.1/Tue Mar  7 17:36:48 2000//TBUGZILLA-2_16_1
-/bugzilla.procmailrc/1.1/Wed Mar 15 23:39:09 2000//TBUGZILLA-2_16_1
-/bugzilla_email_append.pl/1.2.14.2/Tue Sep  3 06:39:06 2002//TBUGZILLA-2_16_1
-/cvs-update.sh/1.1/Wed Apr 18 18:01:28 2001//TBUGZILLA-2_16_1
-/gnats2bz.pl/1.6/Thu Jan 31 14:29:21 2002//TBUGZILLA-2_16_1
-/jb2bz.py/1.1/Wed Feb 13 14:59:30 2002//TBUGZILLA-2_16_1
-/mysqld-watcher.pl/1.2/Fri Jun  1 08:34:45 2001//TBUGZILLA-2_16_1
-/yp_nomail.sh/1.1/Tue Sep 12 23:50:31 2000//TBUGZILLA-2_16_1
+/BugzillaEmail.pm/1.1/Wed Mar 15 22:29:44 2000//TBUGZILLA-2_16_2
+/README/1.4/Sun Apr 22 18:13:40 2001//TBUGZILLA-2_16_2
+/README.Mailif/1.3/Wed Mar 15 23:39:03 2000//TBUGZILLA-2_16_2
+/bug_email.pl/1.9.12.2/Sat Aug 17 14:24:09 2002//TBUGZILLA-2_16_2
+/bugmail_help.html/1.1/Tue Mar  7 17:36:48 2000//TBUGZILLA-2_16_2
+/bugzilla.procmailrc/1.1/Wed Mar 15 23:39:09 2000//TBUGZILLA-2_16_2
+/bugzilla_email_append.pl/1.2.14.2/Tue Sep  3 06:39:06 2002//TBUGZILLA-2_16_2
+/cvs-update.sh/1.1/Wed Apr 18 18:01:28 2001//TBUGZILLA-2_16_2
+/gnats2bz.pl/1.6/Thu Jan 31 14:29:21 2002//TBUGZILLA-2_16_2
+/jb2bz.py/1.1/Wed Feb 13 14:59:30 2002//TBUGZILLA-2_16_2
+/mysqld-watcher.pl/1.2/Fri Jun  1 08:34:45 2001//TBUGZILLA-2_16_2
+/yp_nomail.sh/1.1/Tue Sep 12 23:50:31 2000//TBUGZILLA-2_16_2
 D/cmdline////
diff --git a/contrib/CVS/Tag b/contrib/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/contrib/CVS/Tag
+++ b/contrib/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/contrib/cmdline/CVS/Entries b/contrib/cmdline/CVS/Entries
index c73401aafe33354342697bb3543c0ade269d45e7..9340d151079dbba03967060e7bbcedbf13b12b5f 100644
--- a/contrib/cmdline/CVS/Entries
+++ b/contrib/cmdline/CVS/Entries
@@ -1,4 +1,4 @@
-/buglist/1.1/Thu Nov 15 17:04:58 2001//TBUGZILLA-2_16_1
-/bugs/1.1/Thu Nov 15 17:04:58 2001//TBUGZILLA-2_16_1
-/query.conf/1.1/Thu Nov 15 17:04:58 2001//TBUGZILLA-2_16_1
+/buglist/1.1/Thu Nov 15 17:04:58 2001//TBUGZILLA-2_16_2
+/bugs/1.1/Thu Nov 15 17:04:58 2001//TBUGZILLA-2_16_2
+/query.conf/1.1/Thu Nov 15 17:04:58 2001//TBUGZILLA-2_16_2
 D
diff --git a/contrib/cmdline/CVS/Tag b/contrib/cmdline/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/contrib/cmdline/CVS/Tag
+++ b/contrib/cmdline/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/css/CVS/Entries b/css/CVS/Entries
index 224a83e0c9ea27293888acbd7aa05c5a10919dc7..abea81a0d159666e1e727effc89b4234a563ae43 100644
--- a/css/CVS/Entries
+++ b/css/CVS/Entries
@@ -1,3 +1,3 @@
-/buglist.css/1.1/Tue Mar 12 13:55:00 2002//TBUGZILLA-2_16_1
-/panel.css/1.1/Wed Dec 12 22:41:11 2001//TBUGZILLA-2_16_1
+/buglist.css/1.1/Tue Mar 12 13:55:00 2002//TBUGZILLA-2_16_2
+/panel.css/1.1/Wed Dec 12 22:41:11 2001//TBUGZILLA-2_16_2
 D
diff --git a/css/CVS/Tag b/css/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/css/CVS/Tag
+++ b/css/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/docs/CVS/Entries b/docs/CVS/Entries
index 9c867c3a75f4b5f89d7198ab8eac1da27a14b4db..570a8e5e754f33e09e2ccb1b81ce9dd8c7cdcbd0 100644
--- a/docs/CVS/Entries
+++ b/docs/CVS/Entries
@@ -1,5 +1,5 @@
-/README.docs/1.6/Wed May  1 09:24:40 2002//TBUGZILLA-2_16_1
-/rel_notes.txt/1.10.2.11/Sun Sep 29 05:24:53 2002//TBUGZILLA-2_16_1
+/README.docs/1.6/Wed May  1 09:24:40 2002//TBUGZILLA-2_16_2
+/rel_notes.txt/1.10.2.13/Thu Jan  2 17:10:56 2003//TBUGZILLA-2_16_2
 D/html////
 D/images////
 D/sgml////
diff --git a/docs/CVS/Tag b/docs/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/docs/CVS/Tag
+++ b/docs/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/docs/html/CVS/Entries b/docs/html/CVS/Entries
index 992b4d7d5ce567741b40c9f2c83fdbbe417d9bcc..179e28393998737f981bb58595640eb55e3b2a0d 100644
--- a/docs/html/CVS/Entries
+++ b/docs/html/CVS/Entries
@@ -1,48 +1,48 @@
-/Bugzilla-Guide.html/1.15.2.1/Thu Jul 25 21:03:10 2002//TBUGZILLA-2_16_1
-/about.html/1.7.2.1/Sat May 11 17:59:49 2002//TBUGZILLA-2_16_1
-/aboutthisguide.html/1.9/Wed May  8 21:16:36 2002//TBUGZILLA-2_16_1
-/administration.html/1.7.2.5/Thu Jul 25 20:48:28 2002//TBUGZILLA-2_16_1
-/cmdline.html/1.7.2.3/Sat May 25 15:36:47 2002//TBUGZILLA-2_16_1
-/conventions.html/1.8.2.4/Thu Jul 25 20:48:29 2002//TBUGZILLA-2_16_1
-/copyright.html/1.9.2.3/Thu Jul 25 20:48:29 2002//TBUGZILLA-2_16_1
-/credits.html/1.8.2.1/Sat May 11 17:59:52 2002//TBUGZILLA-2_16_1
-/cust-templates.html/1.1.2.5/Thu Jul 25 21:03:13 2002//TBUGZILLA-2_16_1
-/database.html/1.6.2.3/Sat May 25 15:36:47 2002//TBUGZILLA-2_16_1
-/dbdoc.html/1.9.2.5/Thu Jul 25 20:48:30 2002//TBUGZILLA-2_16_1
-/dbschema.html/1.7.2.1/Sun May 12 16:15:16 2002//TBUGZILLA-2_16_1
-/disclaimer.html/1.7.2.1/Sat May 11 17:59:54 2002//TBUGZILLA-2_16_1
-/extraconfig.html/1.1.2.4/Thu Jul 25 20:48:30 2002//TBUGZILLA-2_16_1
-/faq.html/1.10.2.5/Thu Jul 25 20:48:30 2002//TBUGZILLA-2_16_1
-/glossary.html/1.11.2.5/Thu Jul 25 20:48:32 2002//TBUGZILLA-2_16_1
-/groups.html/1.1.2.2/Sat May 25 15:36:51 2002//TBUGZILLA-2_16_1
-/hintsandtips.html/1.1.2.3/Sat Jul 13 07:54:03 2002//TBUGZILLA-2_16_1
-/how.html/1.10.2.4/Thu Jul 25 20:48:33 2002//TBUGZILLA-2_16_1
-/index.html/1.11.2.5/Thu Jul 25 20:48:33 2002//TBUGZILLA-2_16_1
-/installation.html/1.10.2.5/Thu Jul 25 20:48:33 2002//TBUGZILLA-2_16_1
-/integration.html/1.7.2.3/Sat May 25 15:36:54 2002//TBUGZILLA-2_16_1
-/introduction.html/1.1.2.1/Sun May 12 16:17:40 2002//TBUGZILLA-2_16_1
-/newversions.html/1.8.2.1/Sat May 11 18:00:00 2002//TBUGZILLA-2_16_1
-/osx.html/1.3.2.3/Sat May 25 15:36:54 2002//TBUGZILLA-2_16_1
-/parameters.html/1.1.2.1/Sat May 25 15:39:13 2002//TBUGZILLA-2_16_1
-/patches.html/1.10.2.3/Sat May 25 15:36:54 2002//TBUGZILLA-2_16_1
-/programadmin.html/1.10.2.3/Sat May 25 15:36:55 2002//TBUGZILLA-2_16_1
-/rewrite.html/1.3.2.2/Sun May 12 16:15:22 2002//TBUGZILLA-2_16_1
-/rhbugzilla.html/1.8.2.3/Thu Jul 25 20:48:34 2002//TBUGZILLA-2_16_1
-/security.html/1.9.2.3/Sat May 25 15:36:55 2002//TBUGZILLA-2_16_1
-/stepbystep.html/1.8.2.5/Sat Jul 13 07:54:05 2002//TBUGZILLA-2_16_1
-/troubleshooting.html/1.1.2.4/Thu Jul 25 20:48:35 2002//TBUGZILLA-2_16_1
-/upgrading.html/1.1.2.2/Sat Jul 13 07:54:06 2002//TBUGZILLA-2_16_1
-/useradmin.html/1.8.2.2/Sat May 25 15:36:57 2002//TBUGZILLA-2_16_1
-/userpreferences.html/1.1.2.2/Sat May 25 15:36:57 2002//TBUGZILLA-2_16_1
-/using.html/1.8.2.4/Sat Jul 13 07:54:06 2002//TBUGZILLA-2_16_1
-/variant-fenris.html/1.3.2.2/Sun May 12 16:15:24 2002//TBUGZILLA-2_16_1
-/variant-issuezilla.html/1.3.2.2/Sun May 12 16:15:24 2002//TBUGZILLA-2_16_1
-/variant-perforce.html/1.3.2.3/Sat May 25 15:36:58 2002//TBUGZILLA-2_16_1
-/variant-scarab.html/1.3.2.3/Thu Jul 25 20:48:35 2002//TBUGZILLA-2_16_1
-/variant-sourceforge.html/1.3.2.2/Sun May 12 16:15:25 2002//TBUGZILLA-2_16_1
-/variants.html/1.8.2.2/Sun May 12 16:15:25 2002//TBUGZILLA-2_16_1
-/voting.html/1.1.2.2/Sat May 25 15:36:58 2002//TBUGZILLA-2_16_1
-/whatis.html/1.8.2.1/Sat May 11 18:00:07 2002//TBUGZILLA-2_16_1
-/why.html/1.7.2.2/Thu Jul 25 20:48:35 2002//TBUGZILLA-2_16_1
-/win32.html/1.7.2.5/Thu Jul 25 20:48:36 2002//TBUGZILLA-2_16_1
+/Bugzilla-Guide.html/1.15.2.1/Thu Jul 25 21:03:10 2002//TBUGZILLA-2_16_2
+/about.html/1.7.2.1/Sat May 11 17:59:49 2002//TBUGZILLA-2_16_2
+/aboutthisguide.html/1.9/Wed May  8 21:16:36 2002//TBUGZILLA-2_16_2
+/administration.html/1.7.2.5/Thu Jul 25 20:48:28 2002//TBUGZILLA-2_16_2
+/cmdline.html/1.7.2.3/Sat May 25 15:36:47 2002//TBUGZILLA-2_16_2
+/conventions.html/1.8.2.4/Thu Jul 25 20:48:29 2002//TBUGZILLA-2_16_2
+/copyright.html/1.9.2.3/Thu Jul 25 20:48:29 2002//TBUGZILLA-2_16_2
+/credits.html/1.8.2.1/Sat May 11 17:59:52 2002//TBUGZILLA-2_16_2
+/cust-templates.html/1.1.2.5/Thu Jul 25 21:03:13 2002//TBUGZILLA-2_16_2
+/database.html/1.6.2.3/Sat May 25 15:36:47 2002//TBUGZILLA-2_16_2
+/dbdoc.html/1.9.2.5/Thu Jul 25 20:48:30 2002//TBUGZILLA-2_16_2
+/dbschema.html/1.7.2.1/Sun May 12 16:15:16 2002//TBUGZILLA-2_16_2
+/disclaimer.html/1.7.2.1/Sat May 11 17:59:54 2002//TBUGZILLA-2_16_2
+/extraconfig.html/1.1.2.4/Thu Jul 25 20:48:30 2002//TBUGZILLA-2_16_2
+/faq.html/1.10.2.5/Thu Jul 25 20:48:30 2002//TBUGZILLA-2_16_2
+/glossary.html/1.11.2.5/Thu Jul 25 20:48:32 2002//TBUGZILLA-2_16_2
+/groups.html/1.1.2.2/Sat May 25 15:36:51 2002//TBUGZILLA-2_16_2
+/hintsandtips.html/1.1.2.3/Sat Jul 13 07:54:03 2002//TBUGZILLA-2_16_2
+/how.html/1.10.2.4/Thu Jul 25 20:48:33 2002//TBUGZILLA-2_16_2
+/index.html/1.11.2.5/Thu Jul 25 20:48:33 2002//TBUGZILLA-2_16_2
+/installation.html/1.10.2.5/Thu Jul 25 20:48:33 2002//TBUGZILLA-2_16_2
+/integration.html/1.7.2.3/Sat May 25 15:36:54 2002//TBUGZILLA-2_16_2
+/introduction.html/1.1.2.1/Sun May 12 16:17:40 2002//TBUGZILLA-2_16_2
+/newversions.html/1.8.2.1/Sat May 11 18:00:00 2002//TBUGZILLA-2_16_2
+/osx.html/1.3.2.3/Sat May 25 15:36:54 2002//TBUGZILLA-2_16_2
+/parameters.html/1.1.2.1/Sat May 25 15:39:13 2002//TBUGZILLA-2_16_2
+/patches.html/1.10.2.3/Sat May 25 15:36:54 2002//TBUGZILLA-2_16_2
+/programadmin.html/1.10.2.3/Sat May 25 15:36:55 2002//TBUGZILLA-2_16_2
+/rewrite.html/1.3.2.2/Sun May 12 16:15:22 2002//TBUGZILLA-2_16_2
+/rhbugzilla.html/1.8.2.3/Thu Jul 25 20:48:34 2002//TBUGZILLA-2_16_2
+/security.html/1.9.2.3/Sat May 25 15:36:55 2002//TBUGZILLA-2_16_2
+/stepbystep.html/1.8.2.5/Sat Jul 13 07:54:05 2002//TBUGZILLA-2_16_2
+/troubleshooting.html/1.1.2.4/Thu Jul 25 20:48:35 2002//TBUGZILLA-2_16_2
+/upgrading.html/1.1.2.2/Sat Jul 13 07:54:06 2002//TBUGZILLA-2_16_2
+/useradmin.html/1.8.2.2/Sat May 25 15:36:57 2002//TBUGZILLA-2_16_2
+/userpreferences.html/1.1.2.2/Sat May 25 15:36:57 2002//TBUGZILLA-2_16_2
+/using.html/1.8.2.4/Sat Jul 13 07:54:06 2002//TBUGZILLA-2_16_2
+/variant-fenris.html/1.3.2.2/Sun May 12 16:15:24 2002//TBUGZILLA-2_16_2
+/variant-issuezilla.html/1.3.2.2/Sun May 12 16:15:24 2002//TBUGZILLA-2_16_2
+/variant-perforce.html/1.3.2.3/Sat May 25 15:36:58 2002//TBUGZILLA-2_16_2
+/variant-scarab.html/1.3.2.3/Thu Jul 25 20:48:35 2002//TBUGZILLA-2_16_2
+/variant-sourceforge.html/1.3.2.2/Sun May 12 16:15:25 2002//TBUGZILLA-2_16_2
+/variants.html/1.8.2.2/Sun May 12 16:15:25 2002//TBUGZILLA-2_16_2
+/voting.html/1.1.2.2/Sat May 25 15:36:58 2002//TBUGZILLA-2_16_2
+/whatis.html/1.8.2.1/Sat May 11 18:00:07 2002//TBUGZILLA-2_16_2
+/why.html/1.7.2.2/Thu Jul 25 20:48:35 2002//TBUGZILLA-2_16_2
+/win32.html/1.7.2.5/Thu Jul 25 20:48:36 2002//TBUGZILLA-2_16_2
 D
diff --git a/docs/html/CVS/Tag b/docs/html/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/docs/html/CVS/Tag
+++ b/docs/html/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/docs/images/CVS/Entries b/docs/images/CVS/Entries
index 09be89d735403ae0f238cea16bd9792da89e6969..49d954b96e50e0011a51d171852e1b8143622367 100644
--- a/docs/images/CVS/Entries
+++ b/docs/images/CVS/Entries
@@ -1,7 +1,7 @@
-/caution.gif/1.2/Wed May  8 21:16:44 2002/-kb/TBUGZILLA-2_16_1
-/dbschema.jpg/1.1/Wed Aug 29 17:25:34 2001/-kb/TBUGZILLA-2_16_1
-/dbschema.ps/1.1/Wed Aug 29 17:25:34 2001/-kb/TBUGZILLA-2_16_1
-/note.gif/1.1/Thu Aug 23 14:30:18 2001/-kb/TBUGZILLA-2_16_1
-/tip.gif/1.2/Wed May  8 21:16:44 2002/-kb/TBUGZILLA-2_16_1
-/warning.gif/1.2/Wed May  8 21:16:44 2002/-kb/TBUGZILLA-2_16_1
+/caution.gif/1.2/Wed May  8 21:16:44 2002/-kb/TBUGZILLA-2_16_2
+/dbschema.jpg/1.1/Wed Aug 29 17:25:34 2001/-kb/TBUGZILLA-2_16_2
+/dbschema.ps/1.1/Wed Aug 29 17:25:34 2001/-kb/TBUGZILLA-2_16_2
+/note.gif/1.1/Thu Aug 23 14:30:18 2001/-kb/TBUGZILLA-2_16_2
+/tip.gif/1.2/Wed May  8 21:16:44 2002/-kb/TBUGZILLA-2_16_2
+/warning.gif/1.2/Wed May  8 21:16:44 2002/-kb/TBUGZILLA-2_16_2
 D
diff --git a/docs/images/CVS/Tag b/docs/images/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/docs/images/CVS/Tag
+++ b/docs/images/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/docs/rel_notes.txt b/docs/rel_notes.txt
index 7513a1b4c1981df54a94b76923acd0f9d295bdf5..41d1ab29709e18d7ff811b15a3347d5b68ed14ba 100644
--- a/docs/rel_notes.txt
+++ b/docs/rel_notes.txt
@@ -1,5 +1,4 @@
-The 2.16.1 release fixes various bugs found in the 2.16
-release, including some security issues.
+The 2.16.2 release fixes some minor issues in 2.16.1.
 
 **************************
 *** ABOUT THIS VERSION ***
@@ -10,7 +9,7 @@ bugzilla.mozilla.org unless otherwise specified.
 
 *** Recommended Practice For The Upgrade ***
 
-As always, please ensure you have ran checksetup.pl after
+As always, please ensure you have run checksetup.pl after
 replacing the files in your installation.
 
 It is recommended that you view the sanity check page
@@ -21,8 +20,9 @@ problems with your installation.
 It is also recommended that if you can, you immediately fix
 any problems you find.  Be aware that if the sanity check page
 contains more errors after an upgrade, it doesn't necessarily
-mean there are more errors in your database, as it is likely
-they weren't being checked for in the old version.
+mean there are more errors in your database, as additional
+tests are added to the sanity check over time, and it is likely
+those errors weren't being checked for in the old version.
 
 Failure to do this may mean that bugzilla will not
 work correctly.
@@ -51,17 +51,16 @@ XML::Parser (any)
 *** Deprecated Features ***
 
 - This is possibly the last stable release that will work with
-  MySQL version 3.22.  Soon Bugzilla will require at least
-  version 3.23.x.  The exact minimum version number required
-  has not yet been decided.
+  MySQL version 3.22.  Development versions of Bugzilla currently
+  require at least version 3.23.6.
   (bug 87958)
 
 - This is possibly the last stable release to support the
-  shadow database.  The replacement (using MySQL's built in
-  replication) is not present in 2.16, but we expect that
-  very few sites use this feature, so we are not planning a
-  transition period.  If this would cause a problem for you,
-  please comment on the below bug.
+  shadow database.  Support for it has already been removed
+  in CVS.  The replacement (using MySQL's built in replication)
+  is not present in 2.16.2, but we expect that very few sites use
+  this feature, so we are not planning a transition period.  If
+  this would cause a problem for you, please comment on the below bug.
   (bug 124589)
 
 - Placing comments in localconfig is deprecated.  If you have done
@@ -124,9 +123,26 @@ fix the problem on your installation.
   option "The bug is resolved or verified" to achieve part of this.
   (bug 130821)
 
-*********************************************
-*** USERS UPGRADING FROM 2.16 OR EARLIER  ***
-*********************************************
+*****************************************************************
+*** USERS UPGRADING FROM 2.16.1 OR EARLIER, 2.14.4 OR EARLIER ***
+*****************************************************************
+
+*** SECURITY ISSUES RESOLVED ***
+
+- Fixed a cross site scriptability issue in quips.  This is only a problem
+  if quips with HTML could have been inserted into your quips files.  Bugzilla
+  has not allowed this since 2.12.
+  (bug 179329)
+- checksetup.pl will now attempt to prevent access to "editor backups" of
+  localconfig.
+  (bug 186383)
+- collectstats.pl no longer makes data/mining (which contains graphing
+  information) world writeable.
+  (bug 183188)
+
+***********************************************
+*** USERS UPGRADING FROM 2.16.0 OR EARLIER  ***
+***********************************************
 
 *** SECURITY ISSUES RESOLVED ***
 
@@ -167,7 +183,7 @@ See also next major section.
 See also next section.
 
 ******************************************************
-*** USERS UPGRADING FROM 2.14.3 OR EARLIER, 2.16.0 ***
+*** USERS UPGRADING FROM 2.16.0, 2.14.3 OR EARLIER ***
 ******************************************************
 
 *** SECURITY ISSUES RESOLVED ***
@@ -195,7 +211,7 @@ See also next section.
   (bug 160631)
 
 ***********************************************
-*** USERS UPGRADING FROM 2.14.4 OR EARLIER  ***
+*** USERS UPGRADING FROM 2.14.5 OR EARLIER  ***
 ***********************************************
 
 *** SECURITY ISSUES RESOLVED ***
@@ -411,6 +427,13 @@ See also next section.
   their only email preference was being added or removed from QA.
   (bug 143091)
 
+***********************************************
+*** USERS UPGRADING FROM 2.14.4 OR EARLIER  ***
+***********************************************
+
+See section above about users upgrading from 2.16.1 or earlier,
+2.14.4 or earlier.
+
 ***********************************************
 *** USERS UPGRADING FROM 2.14.3 OR EARLIER  ***
 ***********************************************
diff --git a/docs/sgml/CVS/Entries b/docs/sgml/CVS/Entries
index 00f904aa7d086e49a60eb64aaa2bbe45dc7cfaad..036b2761e043f3d9de9f33c211e60d9d40badadc 100644
--- a/docs/sgml/CVS/Entries
+++ b/docs/sgml/CVS/Entries
@@ -1,18 +1,18 @@
-/Bugzilla-Guide.sgml/1.11.2.4/Thu Jul 25 21:03:27 2002//TBUGZILLA-2_16_1
-/about.sgml/1.6.2.2/Sun May 12 16:15:29 2002//TBUGZILLA-2_16_1
-/administration.sgml/1.13.2.5/Thu Jul 25 21:03:28 2002//TBUGZILLA-2_16_1
-/conventions.sgml/1.4.2.4/Thu Jul 25 21:03:28 2002//TBUGZILLA-2_16_1
-/database.sgml/1.7.2.1/Sat May 25 15:36:06 2002//TBUGZILLA-2_16_1
-/dbschema.mysql/1.2/Wed May  8 23:19:09 2002//TBUGZILLA-2_16_1
-/faq.sgml/1.8.2.2/Sat Jul 13 07:53:28 2002//TBUGZILLA-2_16_1
-/gd-makefile.patch/1.1.2.1/Sun May 12 13:16:48 2002//TBUGZILLA-2_16_1
-/gfdl.sgml/1.4.2.1/Sun May 12 16:15:29 2002//TBUGZILLA-2_16_1
-/glossary.sgml/1.5.2.2/Sun May 12 16:15:29 2002//TBUGZILLA-2_16_1
-/index.sgml/1.3/Wed May  8 23:19:09 2002//TBUGZILLA-2_16_1
-/installation.sgml/1.18.2.5/Thu Jul 25 21:03:29 2002//TBUGZILLA-2_16_1
-/integration.sgml/1.7.2.2/Sat May 25 15:36:08 2002//TBUGZILLA-2_16_1
-/introduction.sgml/1.1.2.2/Thu Jul 25 21:03:29 2002//TBUGZILLA-2_16_1
-/patches.sgml/1.13.2.3/Sat May 25 15:36:10 2002//TBUGZILLA-2_16_1
-/using.sgml/1.10.2.5/Thu Jul 25 21:03:29 2002//TBUGZILLA-2_16_1
-/variants.sgml/1.6.2.5/Thu Jul 25 21:03:30 2002//TBUGZILLA-2_16_1
+/Bugzilla-Guide.sgml/1.11.2.4/Thu Jul 25 21:03:27 2002//TBUGZILLA-2_16_2
+/about.sgml/1.6.2.2/Sun May 12 16:15:29 2002//TBUGZILLA-2_16_2
+/administration.sgml/1.13.2.5/Thu Jul 25 21:03:28 2002//TBUGZILLA-2_16_2
+/conventions.sgml/1.4.2.4/Thu Jul 25 21:03:28 2002//TBUGZILLA-2_16_2
+/database.sgml/1.7.2.1/Sat May 25 15:36:06 2002//TBUGZILLA-2_16_2
+/dbschema.mysql/1.2/Wed May  8 23:19:09 2002//TBUGZILLA-2_16_2
+/faq.sgml/1.8.2.2/Sat Jul 13 07:53:28 2002//TBUGZILLA-2_16_2
+/gd-makefile.patch/1.1.2.1/Sun May 12 13:16:48 2002//TBUGZILLA-2_16_2
+/gfdl.sgml/1.4.2.1/Sun May 12 16:15:29 2002//TBUGZILLA-2_16_2
+/glossary.sgml/1.5.2.2/Sun May 12 16:15:29 2002//TBUGZILLA-2_16_2
+/index.sgml/1.3/Wed May  8 23:19:09 2002//TBUGZILLA-2_16_2
+/installation.sgml/1.18.2.5/Thu Jul 25 21:03:29 2002//TBUGZILLA-2_16_2
+/integration.sgml/1.7.2.2/Sat May 25 15:36:08 2002//TBUGZILLA-2_16_2
+/introduction.sgml/1.1.2.2/Thu Jul 25 21:03:29 2002//TBUGZILLA-2_16_2
+/patches.sgml/1.13.2.3/Sat May 25 15:36:10 2002//TBUGZILLA-2_16_2
+/using.sgml/1.10.2.5/Thu Jul 25 21:03:29 2002//TBUGZILLA-2_16_2
+/variants.sgml/1.6.2.5/Thu Jul 25 21:03:30 2002//TBUGZILLA-2_16_2
 D
diff --git a/docs/sgml/CVS/Tag b/docs/sgml/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/docs/sgml/CVS/Tag
+++ b/docs/sgml/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/docs/txt/CVS/Entries b/docs/txt/CVS/Entries
index b8363d943b3fae22d4763f1184fdf8508300286a..07ab1543ee0d77782c49606a3cbfaf3322676d53 100644
--- a/docs/txt/CVS/Entries
+++ b/docs/txt/CVS/Entries
@@ -1,2 +1,2 @@
-/Bugzilla-Guide.txt/1.14.2.1/Thu Jul 25 21:10:06 2002//TBUGZILLA-2_16_1
+/Bugzilla-Guide.txt/1.14.2.1/Thu Jul 25 21:10:06 2002//TBUGZILLA-2_16_2
 D
diff --git a/docs/txt/CVS/Tag b/docs/txt/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/docs/txt/CVS/Tag
+++ b/docs/txt/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/globals.pl b/globals.pl
index 15e4bcecccb86c0b6f467a985e23a26e35891e7f..c36ffd51e45886f9c84516b64490c5d116f55a69 100644
--- a/globals.pl
+++ b/globals.pl
@@ -98,7 +98,7 @@ $::SIG{TERM} = 'IGNORE';
 $::SIG{PIPE} = 'IGNORE';
 
 # Contains the version string for the current running Bugzilla.
-$::param{'version'} = '2.16.1';
+$::param{'version'} = '2.16.2';
 
 $::dontchange = "--do_not_change--";
 $::chooseone = "--Choose_one:--";
diff --git a/t/CVS/Entries b/t/CVS/Entries
index 37c913d59b37aa003b870cf46e45d533960a7527..66c9c40cde50c518d70ea7f2e01d6b1e122b0393 100644
--- a/t/CVS/Entries
+++ b/t/CVS/Entries
@@ -1,6 +1,6 @@
-/001compile.t/1.8/Wed May  8 23:49:31 2002//TBUGZILLA-2_16_1
-/002goodperl.t/1.7/Wed May  8 23:49:31 2002//TBUGZILLA-2_16_1
-/003safesys.t/1.4/Wed May  8 23:49:31 2002//TBUGZILLA-2_16_1
-/004template.t/1.15.2.2/Fri Jul 19 14:04:12 2002//TBUGZILLA-2_16_1
-/005no_tabs.t/1.10/Wed May  8 23:49:32 2002//TBUGZILLA-2_16_1
+/001compile.t/1.8/Wed May  8 23:49:31 2002//TBUGZILLA-2_16_2
+/002goodperl.t/1.7/Wed May  8 23:49:31 2002//TBUGZILLA-2_16_2
+/003safesys.t/1.4/Wed May  8 23:49:31 2002//TBUGZILLA-2_16_2
+/004template.t/1.15.2.2/Fri Jul 19 14:04:12 2002//TBUGZILLA-2_16_2
+/005no_tabs.t/1.10/Wed May  8 23:49:32 2002//TBUGZILLA-2_16_2
 D/Support////
diff --git a/t/CVS/Tag b/t/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/t/CVS/Tag
+++ b/t/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/t/Support/CVS/Entries b/t/Support/CVS/Entries
index 1d3c884f468ed852dcfb31cff0c6677c09c6e2fe..75989cddd1fdc81a9b731534b5e5b2a0b9133f5e 100644
--- a/t/Support/CVS/Entries
+++ b/t/Support/CVS/Entries
@@ -1,4 +1,4 @@
-/Files.pm/1.9/Wed Oct 31 01:06:31 2001//TBUGZILLA-2_16_1
-/Systemexec.pm/1.2/Fri Oct 19 22:39:51 2001//TBUGZILLA-2_16_1
-/Templates.pm/1.9/Tue May  7 09:45:32 2002//TBUGZILLA-2_16_1
+/Files.pm/1.9/Wed Oct 31 01:06:31 2001//TBUGZILLA-2_16_2
+/Systemexec.pm/1.2/Fri Oct 19 22:39:51 2001//TBUGZILLA-2_16_2
+/Templates.pm/1.9/Tue May  7 09:45:32 2002//TBUGZILLA-2_16_2
 D
diff --git a/t/Support/CVS/Tag b/t/Support/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/t/Support/CVS/Tag
+++ b/t/Support/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/CVS/Entries b/template/CVS/Entries
index a1b56454f82c047744f4bef919d3d7d3cfec7871..2efd35eb7971fd4653885881ba086b851f94fab4 100644
--- a/template/CVS/Entries
+++ b/template/CVS/Entries
@@ -1,2 +1,2 @@
-/.cvsignore/1.3/Tue May  7 21:33:53 2002//TBUGZILLA-2_16_1
+/.cvsignore/1.3/Tue May  7 21:33:53 2002//TBUGZILLA-2_16_2
 D/en////
diff --git a/template/CVS/Tag b/template/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/CVS/Tag
+++ b/template/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/CVS/Entries b/template/en/CVS/Entries
index 7cb3fbcfd0f20d03d0e5223715ac1a4c735442c1..6ba79b7461d5d1665d9c21448fe7a3521bcdf349 100644
--- a/template/en/CVS/Entries
+++ b/template/en/CVS/Entries
@@ -1,2 +1,2 @@
-/.cvsignore/1.1/Wed Apr 24 07:29:49 2002//TBUGZILLA-2_16_1
+/.cvsignore/1.1/Wed Apr 24 07:29:49 2002//TBUGZILLA-2_16_2
 D/default////
diff --git a/template/en/CVS/Tag b/template/en/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/CVS/Tag
+++ b/template/en/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/CVS/Entries b/template/en/default/CVS/Entries
index 729fd3b81589a9fe5fe7dc2eca43ccfe03fae1a2..c3dd9edfdee1fa390d2bc484f88c359f2fab2054 100644
--- a/template/en/default/CVS/Entries
+++ b/template/en/default/CVS/Entries
@@ -1,5 +1,5 @@
-/index.html.tmpl/1.4.2.2/Sun Jun 23 17:36:05 2002//TBUGZILLA-2_16_1
-/sidebar.xul.tmpl/1.3.2.1/Wed Jul 10 00:05:58 2002//TBUGZILLA-2_16_1
+/index.html.tmpl/1.4.2.2/Sun Jun 23 17:36:05 2002//TBUGZILLA-2_16_2
+/sidebar.xul.tmpl/1.3.2.1/Wed Jul 10 00:05:58 2002//TBUGZILLA-2_16_2
 D/account////
 D/admin////
 D/attachment////
diff --git a/template/en/default/CVS/Tag b/template/en/default/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/CVS/Tag
+++ b/template/en/default/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/account/CVS/Entries b/template/en/default/account/CVS/Entries
index 5a2e2a21942df439b39bf5538ef74e7bb6cff52b..7f45467b3456f69e32feafa4829170e45d71020f 100644
--- a/template/en/default/account/CVS/Entries
+++ b/template/en/default/account/CVS/Entries
@@ -1,7 +1,7 @@
-/cancel-token.txt.tmpl/1.1/Thu Apr 18 18:56:15 2002//TBUGZILLA-2_16_1
-/create.html.tmpl/1.3/Tue Apr 23 23:27:32 2002//TBUGZILLA-2_16_1
-/created.html.tmpl/1.4/Mon May  6 19:16:50 2002//TBUGZILLA-2_16_1
-/exists.html.tmpl/1.4.2.1/Thu May 23 08:13:49 2002//TBUGZILLA-2_16_1
+/cancel-token.txt.tmpl/1.1/Thu Apr 18 18:56:15 2002//TBUGZILLA-2_16_2
+/create.html.tmpl/1.3/Tue Apr 23 23:27:32 2002//TBUGZILLA-2_16_2
+/created.html.tmpl/1.4/Mon May  6 19:16:50 2002//TBUGZILLA-2_16_2
+/exists.html.tmpl/1.4.2.1/Thu May 23 08:13:49 2002//TBUGZILLA-2_16_2
 D/email////
 D/password////
 D/prefs////
diff --git a/template/en/default/account/CVS/Tag b/template/en/default/account/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/account/CVS/Tag
+++ b/template/en/default/account/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/account/email/CVS/Entries b/template/en/default/account/email/CVS/Entries
index 11e8690f36027f4239b5ff879fcdc1c0dacae53e..bf0afba57f9c6c681ec29b24b97a01cbdfa69724 100644
--- a/template/en/default/account/email/CVS/Entries
+++ b/template/en/default/account/email/CVS/Entries
@@ -1,4 +1,4 @@
-/change-new.txt.tmpl/1.3/Fri May  3 06:37:42 2002//TBUGZILLA-2_16_1
-/change-old.txt.tmpl/1.4/Mon May  6 19:16:46 2002//TBUGZILLA-2_16_1
-/confirm.html.tmpl/1.4.2.1/Thu May 23 08:13:51 2002//TBUGZILLA-2_16_1
+/change-new.txt.tmpl/1.3/Fri May  3 06:37:42 2002//TBUGZILLA-2_16_2
+/change-old.txt.tmpl/1.4/Mon May  6 19:16:46 2002//TBUGZILLA-2_16_2
+/confirm.html.tmpl/1.4.2.1/Thu May 23 08:13:51 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/account/email/CVS/Tag b/template/en/default/account/email/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/account/email/CVS/Tag
+++ b/template/en/default/account/email/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/account/password/CVS/Entries b/template/en/default/account/password/CVS/Entries
index 03f068576081b0e962098bdaf1e3c6b5f5b9ba10..2c9efbe90487dff0654b5ee64bfaddcdc8920635 100644
--- a/template/en/default/account/password/CVS/Entries
+++ b/template/en/default/account/password/CVS/Entries
@@ -1,3 +1,3 @@
-/forgotten-password.txt.tmpl/1.2/Fri May  3 06:37:47 2002//TBUGZILLA-2_16_1
-/set-forgotten-password.html.tmpl/1.3.2.1/Thu May 23 08:13:56 2002//TBUGZILLA-2_16_1
+/forgotten-password.txt.tmpl/1.2/Fri May  3 06:37:47 2002//TBUGZILLA-2_16_2
+/set-forgotten-password.html.tmpl/1.3.2.1/Thu May 23 08:13:56 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/account/password/CVS/Tag b/template/en/default/account/password/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/account/password/CVS/Tag
+++ b/template/en/default/account/password/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/account/prefs/CVS/Entries b/template/en/default/account/prefs/CVS/Entries
index 71c23550e0ec457bb3523165a41f89728e9db7d9..c568a6b15c9c7a067992000d06cae5fe1dfa8b51 100644
--- a/template/en/default/account/prefs/CVS/Entries
+++ b/template/en/default/account/prefs/CVS/Entries
@@ -1,6 +1,6 @@
-/account.html.tmpl/1.1.2.1/Thu May 23 08:13:58 2002//TBUGZILLA-2_16_1
-/email.html.tmpl/1.1.2.3/Wed Jul 17 18:28:37 2002//TBUGZILLA-2_16_1
-/footer.html.tmpl/1.1.2.1/Thu May 23 08:13:59 2002//TBUGZILLA-2_16_1
-/permissions.html.tmpl/1.1.2.1/Thu May 23 08:13:59 2002//TBUGZILLA-2_16_1
-/prefs.html.tmpl/1.4.2.2/Tue Aug 13 06:57:03 2002//TBUGZILLA-2_16_1
+/account.html.tmpl/1.1.2.1/Thu May 23 08:13:58 2002//TBUGZILLA-2_16_2
+/email.html.tmpl/1.1.2.3/Wed Jul 17 18:28:37 2002//TBUGZILLA-2_16_2
+/footer.html.tmpl/1.1.2.1/Thu May 23 08:13:59 2002//TBUGZILLA-2_16_2
+/permissions.html.tmpl/1.1.2.1/Thu May 23 08:13:59 2002//TBUGZILLA-2_16_2
+/prefs.html.tmpl/1.4.2.2/Tue Aug 13 06:57:03 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/account/prefs/CVS/Tag b/template/en/default/account/prefs/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/account/prefs/CVS/Tag
+++ b/template/en/default/account/prefs/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/admin/CVS/Entries.Log b/template/en/default/admin/CVS/Entries.Log
index 73aacf94896ee58505a2c97449ab268bbe179368..a61dcacb67e43933d7cf41d7cfe3fe13d3376273 100644
--- a/template/en/default/admin/CVS/Entries.Log
+++ b/template/en/default/admin/CVS/Entries.Log
@@ -1,8 +1,10 @@
 A D/common////
 A D/flag-type////
 A D/keywords////
+A D/products////
 A D/request-type////
 R D/request-type////
+R D/products////
 R D/keywords////
 R D/flag-type////
 R D/common////
diff --git a/template/en/default/admin/CVS/Tag b/template/en/default/admin/CVS/Tag
index 4bfd2873eb2e9a20fe20746c5bfe8ede04214b9f..96c74837dccac49d7268476419d9ea5c1fbd44e6 100644
--- a/template/en/default/admin/CVS/Tag
+++ b/template/en/default/admin/CVS/Tag
@@ -1 +1 @@
-TBUGZILLA-2_16_1
+TBUGZILLA-2_16_2
diff --git a/template/en/default/admin/attachstatus/CVS/Entries b/template/en/default/admin/attachstatus/CVS/Entries
index 8c89a437cc0debe3662cc4a51002f716907752ff..b7e97347c8d01b42b9948b7c80e60f434a0ec272 100644
--- a/template/en/default/admin/attachstatus/CVS/Entries
+++ b/template/en/default/admin/attachstatus/CVS/Entries
@@ -1,5 +1,5 @@
-/create.html.tmpl/1.3/Tue Apr 23 23:27:26 2002//TBUGZILLA-2_16_1
-/delete.html.tmpl/1.3/Tue Apr 23 23:27:25 2002//TBUGZILLA-2_16_1
-/edit.html.tmpl/1.4/Mon May  6 19:16:58 2002//TBUGZILLA-2_16_1
-/list.html.tmpl/1.4/Mon May  6 19:16:58 2002//TBUGZILLA-2_16_1
+/create.html.tmpl/1.3/Tue Apr 23 23:27:26 2002//TBUGZILLA-2_16_2
+/delete.html.tmpl/1.3/Tue Apr 23 23:27:25 2002//TBUGZILLA-2_16_2
+/edit.html.tmpl/1.4/Mon May  6 19:16:58 2002//TBUGZILLA-2_16_2
+/list.html.tmpl/1.4/Mon May  6 19:16:58 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/admin/attachstatus/CVS/Tag b/template/en/default/admin/attachstatus/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/admin/attachstatus/CVS/Tag
+++ b/template/en/default/admin/attachstatus/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/attachment/CVS/Entries b/template/en/default/attachment/CVS/Entries
index 1bc6d575445721a7f325ddd7ef2e398ed0ab92be..02dc704753b05720ec6add3ef6b3501599bbdd43 100644
--- a/template/en/default/attachment/CVS/Entries
+++ b/template/en/default/attachment/CVS/Entries
@@ -1,8 +1,8 @@
-/content-types.html.tmpl/1.1/Thu Apr 18 18:56:29 2002//TBUGZILLA-2_16_1
-/create.html.tmpl/1.5.2.2/Tue Jun  4 22:56:38 2002//TBUGZILLA-2_16_1
-/created.html.tmpl/1.4.2.1/Thu May 23 08:14:02 2002//TBUGZILLA-2_16_1
-/edit.html.tmpl/1.4.2.2/Tue Jun 11 09:27:21 2002//TBUGZILLA-2_16_1
-/list.html.tmpl/1.1/Thu Apr 18 18:56:30 2002//TBUGZILLA-2_16_1
-/show-multiple.html.tmpl/1.3.2.1/Thu May 23 08:14:03 2002//TBUGZILLA-2_16_1
-/updated.html.tmpl/1.4.2.1/Thu May 23 08:14:03 2002//TBUGZILLA-2_16_1
+/content-types.html.tmpl/1.1/Thu Apr 18 18:56:29 2002//TBUGZILLA-2_16_2
+/create.html.tmpl/1.5.2.2/Tue Jun  4 22:56:38 2002//TBUGZILLA-2_16_2
+/created.html.tmpl/1.4.2.1/Thu May 23 08:14:02 2002//TBUGZILLA-2_16_2
+/edit.html.tmpl/1.4.2.2/Tue Jun 11 09:27:21 2002//TBUGZILLA-2_16_2
+/list.html.tmpl/1.1/Thu Apr 18 18:56:30 2002//TBUGZILLA-2_16_2
+/show-multiple.html.tmpl/1.3.2.1/Thu May 23 08:14:03 2002//TBUGZILLA-2_16_2
+/updated.html.tmpl/1.4.2.1/Thu May 23 08:14:03 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/attachment/CVS/Tag b/template/en/default/attachment/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/attachment/CVS/Tag
+++ b/template/en/default/attachment/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/bug/CVS/Entries b/template/en/default/bug/CVS/Entries
index c9b55318b7afbeb7a391ef9da6270e296c585847..2c35db958e005f6f82deca667ccfcbf37e7f69a8 100644
--- a/template/en/default/bug/CVS/Entries
+++ b/template/en/default/bug/CVS/Entries
@@ -1,11 +1,11 @@
-/choose-xml.html.tmpl/1.4.2.1/Thu May 23 08:14:05 2002//TBUGZILLA-2_16_1
-/choose.html.tmpl/1.3/Tue Apr 23 23:27:50 2002//TBUGZILLA-2_16_1
-/comments.html.tmpl/1.1.2.1/Sat Jun 22 21:03:21 2002//TBUGZILLA-2_16_1
-/dependency-graph.html.tmpl/1.5.2.1/Thu May 23 08:14:05 2002//TBUGZILLA-2_16_1
-/dependency-tree.html.tmpl/1.4.2.1/Mon May 13 06:24:20 2002//TBUGZILLA-2_16_1
-/edit.html.tmpl/1.7.2.5/Tue Jul  9 01:17:59 2002//TBUGZILLA-2_16_1
-/navigate.html.tmpl/1.1.2.1/Thu May  9 23:15:05 2002//TBUGZILLA-2_16_1
-/show-multiple.html.tmpl/1.3.2.1/Thu May 23 08:14:05 2002//TBUGZILLA-2_16_1
+/choose-xml.html.tmpl/1.4.2.1/Thu May 23 08:14:05 2002//TBUGZILLA-2_16_2
+/choose.html.tmpl/1.3/Tue Apr 23 23:27:50 2002//TBUGZILLA-2_16_2
+/comments.html.tmpl/1.1.2.1/Sat Jun 22 21:03:21 2002//TBUGZILLA-2_16_2
+/dependency-graph.html.tmpl/1.5.2.1/Thu May 23 08:14:05 2002//TBUGZILLA-2_16_2
+/dependency-tree.html.tmpl/1.4.2.1/Mon May 13 06:24:20 2002//TBUGZILLA-2_16_2
+/edit.html.tmpl/1.7.2.5/Tue Jul  9 01:17:59 2002//TBUGZILLA-2_16_2
+/navigate.html.tmpl/1.1.2.1/Thu May  9 23:15:05 2002//TBUGZILLA-2_16_2
+/show-multiple.html.tmpl/1.3.2.1/Thu May 23 08:14:05 2002//TBUGZILLA-2_16_2
 D/activity////
 D/create////
 D/process////
diff --git a/template/en/default/bug/CVS/Tag b/template/en/default/bug/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/bug/CVS/Tag
+++ b/template/en/default/bug/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/bug/activity/CVS/Entries b/template/en/default/bug/activity/CVS/Entries
index b6cfea6e76b0e4f21c499a8167ecd65f1d10ddfd..2af8b018e0688d57793f1b6321fac9ae0581fd6a 100644
--- a/template/en/default/bug/activity/CVS/Entries
+++ b/template/en/default/bug/activity/CVS/Entries
@@ -1,3 +1,3 @@
-/show.html.tmpl/1.3.2.1/Thu May 23 08:14:07 2002//TBUGZILLA-2_16_1
-/table.html.tmpl/1.1/Thu Apr 18 18:56:38 2002//TBUGZILLA-2_16_1
+/show.html.tmpl/1.3.2.1/Thu May 23 08:14:07 2002//TBUGZILLA-2_16_2
+/table.html.tmpl/1.1/Thu Apr 18 18:56:38 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/bug/activity/CVS/Tag b/template/en/default/bug/activity/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/bug/activity/CVS/Tag
+++ b/template/en/default/bug/activity/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/bug/create/CVS/Entries b/template/en/default/bug/create/CVS/Entries
index 034b796e40617b2b81872ab78dccb065afd9c62d..3273b2f757f18a940adfe213029a802d2fbc1e73 100644
--- a/template/en/default/bug/create/CVS/Entries
+++ b/template/en/default/bug/create/CVS/Entries
@@ -1,6 +1,6 @@
-/comment.txt.tmpl/1.2/Mon May  6 19:17:06 2002//TBUGZILLA-2_16_1
-/create.html.tmpl/1.6.2.4/Sun Jun 30 04:24:51 2002//TBUGZILLA-2_16_1
-/created.html.tmpl/1.4/Wed May  1 19:00:46 2002//TBUGZILLA-2_16_1
-/make-template.html.tmpl/1.3/Tue Apr 23 23:27:48 2002//TBUGZILLA-2_16_1
-/user-message.html.tmpl/1.1.2.1/Wed Jun  5 03:42:23 2002//TBUGZILLA-2_16_1
+/comment.txt.tmpl/1.2/Mon May  6 19:17:06 2002//TBUGZILLA-2_16_2
+/create.html.tmpl/1.6.2.4/Sun Jun 30 04:24:51 2002//TBUGZILLA-2_16_2
+/created.html.tmpl/1.4/Wed May  1 19:00:46 2002//TBUGZILLA-2_16_2
+/make-template.html.tmpl/1.3/Tue Apr 23 23:27:48 2002//TBUGZILLA-2_16_2
+/user-message.html.tmpl/1.1.2.1/Wed Jun  5 03:42:23 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/bug/create/CVS/Tag b/template/en/default/bug/create/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/bug/create/CVS/Tag
+++ b/template/en/default/bug/create/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/bug/process/CVS/Entries b/template/en/default/bug/process/CVS/Entries
index 66dc03d3ee024f10bc537ef3c8adb78740fd2fd7..37fb8841fefb1dcbbb7afa6b53a3071f7a360e34 100644
--- a/template/en/default/bug/process/CVS/Entries
+++ b/template/en/default/bug/process/CVS/Entries
@@ -1,6 +1,6 @@
-/confirm-duplicate.html.tmpl/1.2.2.1/Tue Sep  3 07:24:57 2002//TBUGZILLA-2_16_1
-/midair.html.tmpl/1.3.2.1/Tue Sep  3 07:24:58 2002//TBUGZILLA-2_16_1
-/next.html.tmpl/1.1/Sun Apr 21 21:30:21 2002//TBUGZILLA-2_16_1
-/results.html.tmpl/1.3/Wed May  1 19:00:49 2002//TBUGZILLA-2_16_1
-/verify-new-product.html.tmpl/1.3.2.5/Tue Sep  3 07:24:58 2002//TBUGZILLA-2_16_1
+/confirm-duplicate.html.tmpl/1.2.2.1/Tue Sep  3 07:24:57 2002//TBUGZILLA-2_16_2
+/midair.html.tmpl/1.3.2.1/Tue Sep  3 07:24:58 2002//TBUGZILLA-2_16_2
+/next.html.tmpl/1.1/Sun Apr 21 21:30:21 2002//TBUGZILLA-2_16_2
+/results.html.tmpl/1.3/Wed May  1 19:00:49 2002//TBUGZILLA-2_16_2
+/verify-new-product.html.tmpl/1.3.2.5/Tue Sep  3 07:24:58 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/bug/process/CVS/Tag b/template/en/default/bug/process/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/bug/process/CVS/Tag
+++ b/template/en/default/bug/process/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/bug/votes/CVS/Entries b/template/en/default/bug/votes/CVS/Entries
index 93f3ee8ac948aeb2b2ae937a1c143ba204e77e9c..0cd2b55c96c48f9b4b282c1e8ad1bbe1ab730fdf 100644
--- a/template/en/default/bug/votes/CVS/Entries
+++ b/template/en/default/bug/votes/CVS/Entries
@@ -1,4 +1,4 @@
-/delete-all.html.tmpl/1.4/Mon May  6 19:17:09 2002//TBUGZILLA-2_16_1
-/list-for-bug.html.tmpl/1.4.2.3/Sat Jun 22 10:35:09 2002//TBUGZILLA-2_16_1
-/list-for-user.html.tmpl/1.6.2.1/Thu May 23 08:14:16 2002//TBUGZILLA-2_16_1
+/delete-all.html.tmpl/1.4/Mon May  6 19:17:09 2002//TBUGZILLA-2_16_2
+/list-for-bug.html.tmpl/1.4.2.3/Sat Jun 22 10:35:09 2002//TBUGZILLA-2_16_2
+/list-for-user.html.tmpl/1.6.2.1/Thu May 23 08:14:16 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/bug/votes/CVS/Tag b/template/en/default/bug/votes/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/bug/votes/CVS/Tag
+++ b/template/en/default/bug/votes/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/global/CVS/Entries b/template/en/default/global/CVS/Entries
index da57ad6884cc0be600cb1a2bdc5d1a0080d90e72..047ec39e878afcb3ef9698c9e92d75e02a638535 100644
--- a/template/en/default/global/CVS/Entries
+++ b/template/en/default/global/CVS/Entries
@@ -1,11 +1,11 @@
-/banner.html.tmpl/1.1.2.1/Tue Jun  4 05:56:34 2002//TBUGZILLA-2_16_1
-/choose-product.html.tmpl/1.6/Mon May  6 19:17:11 2002//TBUGZILLA-2_16_1
-/code-error.html.tmpl/1.4/Mon May  6 19:17:11 2002//TBUGZILLA-2_16_1
-/footer.html.tmpl/1.6/Tue May  7 21:56:40 2002//TBUGZILLA-2_16_1
-/header.html.tmpl/1.5.2.7/Thu Jul  4 11:21:00 2002//TBUGZILLA-2_16_1
-/hidden-fields.html.tmpl/1.2.2.3/Tue Sep  3 07:25:01 2002//TBUGZILLA-2_16_1
-/message.html.tmpl/1.3/Mon May  6 19:17:11 2002//TBUGZILLA-2_16_1
-/select-menu.html.tmpl/1.1.2.1/Mon Jun  3 22:34:12 2002//TBUGZILLA-2_16_1
-/useful-links.html.tmpl/1.2.2.6/Wed Jul 10 00:06:00 2002//TBUGZILLA-2_16_1
-/user-error.html.tmpl/1.4/Mon May  6 19:17:12 2002//TBUGZILLA-2_16_1
+/banner.html.tmpl/1.1.2.1/Tue Jun  4 05:56:34 2002//TBUGZILLA-2_16_2
+/choose-product.html.tmpl/1.6/Mon May  6 19:17:11 2002//TBUGZILLA-2_16_2
+/code-error.html.tmpl/1.4/Mon May  6 19:17:11 2002//TBUGZILLA-2_16_2
+/footer.html.tmpl/1.6/Tue May  7 21:56:40 2002//TBUGZILLA-2_16_2
+/header.html.tmpl/1.5.2.7/Thu Jul  4 11:21:00 2002//TBUGZILLA-2_16_2
+/hidden-fields.html.tmpl/1.2.2.3/Tue Sep  3 07:25:01 2002//TBUGZILLA-2_16_2
+/message.html.tmpl/1.3/Mon May  6 19:17:11 2002//TBUGZILLA-2_16_2
+/select-menu.html.tmpl/1.1.2.1/Mon Jun  3 22:34:12 2002//TBUGZILLA-2_16_2
+/useful-links.html.tmpl/1.2.2.6/Wed Jul 10 00:06:00 2002//TBUGZILLA-2_16_2
+/user-error.html.tmpl/1.4/Mon May  6 19:17:12 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/global/CVS/Tag b/template/en/default/global/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/global/CVS/Tag
+++ b/template/en/default/global/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/list/CVS/Entries b/template/en/default/list/CVS/Entries
index b6fadb0c1de1e461d44c6f3b4d414fd450650601..91915cd6110bc228de73abcc4a13b2e0a7f4edf3 100644
--- a/template/en/default/list/CVS/Entries
+++ b/template/en/default/list/CVS/Entries
@@ -1,9 +1,9 @@
-/change-columns.html.tmpl/1.3/Tue Apr 23 23:27:34 2002//TBUGZILLA-2_16_1
-/edit-multiple.html.tmpl/1.4.2.2/Sun Jun 30 04:24:57 2002//TBUGZILLA-2_16_1
-/list-rdf.rdf.tmpl/1.1/Thu Apr 18 18:56:55 2002//TBUGZILLA-2_16_1
-/list-simple.html.tmpl/1.4.2.1/Thu May 23 08:14:22 2002//TBUGZILLA-2_16_1
-/list.html.tmpl/1.3.2.2/Wed Jun  5 02:23:12 2002//TBUGZILLA-2_16_1
-/quips.html.tmpl/1.4.2.1/Thu May 23 08:14:23 2002//TBUGZILLA-2_16_1
-/server-push.html.tmpl/1.2/Mon May  6 19:17:19 2002//TBUGZILLA-2_16_1
-/table.html.tmpl/1.4.2.2/Mon Jul  1 03:30:23 2002//TBUGZILLA-2_16_1
+/change-columns.html.tmpl/1.3/Tue Apr 23 23:27:34 2002//TBUGZILLA-2_16_2
+/edit-multiple.html.tmpl/1.4.2.2/Sun Jun 30 04:24:57 2002//TBUGZILLA-2_16_2
+/list-rdf.rdf.tmpl/1.1/Thu Apr 18 18:56:55 2002//TBUGZILLA-2_16_2
+/list-simple.html.tmpl/1.4.2.1/Thu May 23 08:14:22 2002//TBUGZILLA-2_16_2
+/list.html.tmpl/1.3.2.2/Wed Jun  5 02:23:12 2002//TBUGZILLA-2_16_2
+/quips.html.tmpl/1.4.2.2/Tue Nov 26 20:32:00 2002//TBUGZILLA-2_16_2
+/server-push.html.tmpl/1.2/Mon May  6 19:17:19 2002//TBUGZILLA-2_16_2
+/table.html.tmpl/1.4.2.2/Mon Jul  1 03:30:23 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/list/CVS/Tag b/template/en/default/list/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/list/CVS/Tag
+++ b/template/en/default/list/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index c874b14d79a917b7ecc9f2ae253dee15c6e5ecfb..f83f081286438947ddb8dfbfe42215c1ecd5db42 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -59,7 +59,7 @@
   </h2>
   <ul>
     [% FOREACH quip = quips %]
-      <li>[% quip %]</li>
+      <li>[% quip FILTER html %]</li>
     [% END %]
   </ul>
 [% ELSE %]
diff --git a/template/en/default/reports/CVS/Entries b/template/en/default/reports/CVS/Entries
index 7a8aeb59d37335b69378c49c818ac06eb2b3f7b2..216e831d7ca43bdf46ab2ca10e4d148471f31ec4 100644
--- a/template/en/default/reports/CVS/Entries
+++ b/template/en/default/reports/CVS/Entries
@@ -1,6 +1,6 @@
-/components.html.tmpl/1.4.2.2/Thu May 30 19:38:22 2002//TBUGZILLA-2_16_1
-/duplicates-simple.html.tmpl/1.1/Fri Apr 26 23:18:53 2002//TBUGZILLA-2_16_1
-/duplicates-table.html.tmpl/1.1.2.2/Thu Jun 13 22:22:32 2002//TBUGZILLA-2_16_1
-/duplicates.html.tmpl/1.4.2.1/Thu May 23 08:14:26 2002//TBUGZILLA-2_16_1
-/keywords.html.tmpl/1.4/Wed Apr 24 18:27:43 2002//TBUGZILLA-2_16_1
+/components.html.tmpl/1.4.2.2/Thu May 30 19:38:22 2002//TBUGZILLA-2_16_2
+/duplicates-simple.html.tmpl/1.1/Fri Apr 26 23:18:53 2002//TBUGZILLA-2_16_2
+/duplicates-table.html.tmpl/1.1.2.2/Thu Jun 13 22:22:32 2002//TBUGZILLA-2_16_2
+/duplicates.html.tmpl/1.4.2.1/Thu May 23 08:14:26 2002//TBUGZILLA-2_16_2
+/keywords.html.tmpl/1.4/Wed Apr 24 18:27:43 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/reports/CVS/Tag b/template/en/default/reports/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/reports/CVS/Tag
+++ b/template/en/default/reports/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2
diff --git a/template/en/default/search/CVS/Entries b/template/en/default/search/CVS/Entries
index 5398bf950d5128afbafebbbe091527d8e440f9d4..fe8b0dfc71388b8800c2d1c0b07f689365a9b4ad 100644
--- a/template/en/default/search/CVS/Entries
+++ b/template/en/default/search/CVS/Entries
@@ -1,5 +1,5 @@
-/boolean-charts.html.tmpl/1.1/Fri Apr 26 20:03:08 2002//TBUGZILLA-2_16_1
-/form.html.tmpl/1.2.2.5/Thu Jul 11 19:28:05 2002//TBUGZILLA-2_16_1
-/knob.html.tmpl/1.2.2.2/Sat Jun 22 23:56:00 2002//TBUGZILLA-2_16_1
-/search.html.tmpl/1.8.2.1/Tue Jun  4 22:56:40 2002//TBUGZILLA-2_16_1
+/boolean-charts.html.tmpl/1.1/Fri Apr 26 20:03:08 2002//TBUGZILLA-2_16_2
+/form.html.tmpl/1.2.2.5/Thu Jul 11 19:28:05 2002//TBUGZILLA-2_16_2
+/knob.html.tmpl/1.2.2.2/Sat Jun 22 23:56:00 2002//TBUGZILLA-2_16_2
+/search.html.tmpl/1.8.2.1/Tue Jun  4 22:56:40 2002//TBUGZILLA-2_16_2
 D
diff --git a/template/en/default/search/CVS/Tag b/template/en/default/search/CVS/Tag
index a828940946a1504759888110b9a753943cd10ff4..7e397d800d56db36f5d0dbb288351253afffee08 100644
--- a/template/en/default/search/CVS/Tag
+++ b/template/en/default/search/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_16_1
+NBUGZILLA-2_16_2