Merge from emacs--rel--22

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-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>

   * lisp/ps-print.el: Problem with foreground and background color when
   printing a buffer with and without faces.  Reported by Christian
   Schlauer <cs-muelleimer-rubbish.bin@arcor.de>.
   (ps-print-version): New version 6.7.5.
   (ps-default-fg): Change default value to nil, so black color is used
   when a face does not specify a foreground color.
   (ps-default-bg): Change default value to nil, so white color is used
   for background color.
   (ps-begin-job): Fix code.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 52d74af9f29..e7c40351d03 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -27,7 +27,7 @@ Please send all bug fixes and enhancements to
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify it under
 ;; the terms of the GNU General Public License as published by the Free
-;; Software Foundation; either version 2, or (at your option) any later
+;; Software Foundation; either version 3, or (at your option) any later
 ;; version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY