Merge from emacs--rel--22
authorMiles Bader <miles@gnu.org>
Thu, 26 Jul 2007 05:18:50 +0000 (05:18 +0000)
committerMiles Bader <miles@gnu.org>
Thu, 26 Jul 2007 05:18:50 +0000 (05:18 +0000)
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

2007-07-23  Jason Rumney  <jasonr@gnu.org>

   * src/filelock.c (current_lock_owner): Allow for @ sign in username.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828


Trivial merge