patch by joel
r=gerv, a=justdave

Bug 164038 - token.cgi: Cancel token messages should be moved into the templates. Patch by burnus; r=gerv.

r=bbaetz, gerv

r=joel x2

early enough
r=mattyt, jouni

the db when required instead.
(Also fixes bug 58242 as a side effect)

r=myk, kiko

Patch by Brad Baetz <bbaetz@student.usyd.edu.au>
r= jake, justdave

Fix for bug 95731: "INSERT INTO shadowlog" failed because "Table 'shadowlog' not locked", fixed typo in lock tables command.
Patch by Myk Melez <myk@mozilla.org>
r= jake@acutex.net

Fix for bug 77473, bug 74032, and bug 85472: Passwords are no longer stored in plaintext in the database.  Passwords are no longer encrypted with MySQL's ENCRYPT() function (because it doesn't work on some installs), but with Perl's crypt() function.  The crypt-related routines now properly deal with salts so that they work on systems that use methods other than UNIX crypt to crypt the passwords (such as MD5).  Checksetup.pl will walk through your database and re-crypt everyone's passwords based on the plaintext password entry, then drop the plaintext password column.  As a consequence of no longer having a plaintext password, it is no longer possible to email someone their password, so the login screen has been changed to request a password reset instead.  The user is emailed a temporary identifying token, with a link back to Bugzilla.  They click on the link or paste it into their browser and Bugzilla allows them to change their password.
Patch by Myk Melez <myk@mozilla.org>
r= justdave@syndicomm.com, jake@acutex.net