--- a/lisp/build-report.el	Mon Aug 13 11:15:00 2007 +0200
+++ b/lisp/build-report.el	Mon Aug 13 11:16:07 2007 +0200
@@ -138,7 +138,7 @@
 ;; Bandaid
 (when (featurep 'mime-setup)
   ;; No (defvaralias ...) so far. Thanks to "Didier Verna"
-  ;; <verna@inf.enst.fr> for reporting my incorrect defvaraliasing of
+  ;; <didier@xemacs.org> for reporting my incorrect defvaraliasing of
   ;; `mime-editor/insert-tag'.
   ;; Thanks to Jens-Ulrik Holger Petersen
   ;; <petersen@kurims.kyoto-u.ac.jp> for suggesting the conditional
@@ -213,7 +213,7 @@
 	      (progn
 		(mime-edit-insert-tag
 		 "text"
-		 "plain" 
+		 "plain"
 		 (concat
 		  "\nContent-Disposition: attachment;"
 		  " filename=\""
@@ -229,7 +229,7 @@
 	  (goto-char (point-min))
 	  (delete-matching-lines (build-report-delete))
 	  (goto-char (point-min))
-	  (insert "> Contents of " 
+	  (insert "> Contents of "
 		  build-report-make-output-file
 		  "\n> keeping lines matching\n> \""
 		  (build-report-keep)
@@ -239,7 +239,7 @@
       (insert "> " build-report-make-output-file
 	      " does not exist!\n\n"))
     (buffer-string)))
-      
+
 (defun build-report-insert-installation-file (where all)
   "Inserts the contents of the `build-report-installation-file'
 created by the XEmacs Beta configure process."
@@ -258,7 +258,7 @@
 	      (progn
 		(mime-edit-insert-tag
 		 "text"
-		 "plain" 
+		 "plain"
 		 (concat
 		  "\nContent-Disposition: attachment;"
 		  " filename=\""