--- linux-2.6-mm/fs/sysv/ChangeLog.orig	2005-06-17 20:23:18.000000000 +0200
+++ linux-2.6-mm/fs/sysv/ChangeLog	2005-06-17 20:24:55.000000000 +0200
@@ -54,7 +54,7 @@
 	  (sysv_read_super): Likewise.
 	  (v7_read_super): Likewise.
 
-Sun Dec 30 2001  Manfred Spraul  <manfreds@colorfullife.com>
+Sun Dec 30 2001  Manfred Spraul  <manfred@colorfullife.com>
 
 	* dir.c (dir_commit_chunk): Do not set dir->i_version.
 	(sysv_readdir): Likewise.
--- linux-2.6-mm/ipc/util.c.orig	2005-06-17 20:23:45.000000000 +0200
+++ linux-2.6-mm/ipc/util.c	2005-06-17 20:24:39.000000000 +0200
@@ -7,7 +7,7 @@
  *            Occurs in several places in the IPC code.
  *            Chris Evans, <chris@ferret.lmh.ox.ac.uk>
  * Nov 1999 - ipc helper functions, unified SMP locking
- *	      Manfred Spraul <manfreds@colorfullife.com>
+ *	      Manfred Spraul <manfred@colorfullife.com>
  * Oct 2002 - One lock per IPC id. RCU ipc_free for lock-free grow_ary().
  *            Mingming Cao <cmm@us.ibm.com>
  */
--- linux-2.6-mm/ipc/util.h.orig	2005-06-17 20:23:51.000000000 +0200
+++ linux-2.6-mm/ipc/util.h	2005-06-17 20:25:34.000000000 +0200
@@ -2,7 +2,7 @@
  * linux/ipc/util.h
  * Copyright (C) 1999 Christoph Rohland
  *
- * ipc helper functions (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+ * ipc helper functions (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  */
 
 #ifndef _IPC_UTIL_H
--- linux-2.6-mm/ipc/msg.c.orig	2005-06-17 20:23:25.000000000 +0200
+++ linux-2.6-mm/ipc/msg.c	2005-06-17 20:26:17.000000000 +0200
@@ -12,7 +12,7 @@
  *
  * mostly rewritten, threaded and wake-one semantics added
  * MSGMAX limit removed, sysctl's added
- * (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+ * (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  */
 
 #include <linux/config.h>
--- linux-2.6-mm/ipc/sem.c.orig	2005-06-17 20:23:39.000000000 +0200
+++ linux-2.6-mm/ipc/sem.c	2005-06-17 20:25:10.000000000 +0200
@@ -56,7 +56,7 @@
  * /proc/sysvipc/sem support (c) 1999 Dragos Acostachioaie <dragos@iname.com>
  *
  * SMP-threaded, sysctl's added
- * (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+ * (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  * Enforced range limit on SEM_UNDO
  * (c) 2001 Red Hat Inc <alan@redhat.com>
  * Lockless wakeup
--- linux-2.6-mm/arch/i386/kernel/cpu/mtrr/changelog.orig	2005-06-17 20:23:58.000000000 +0200
+++ linux-2.6-mm/arch/i386/kernel/cpu/mtrr/changelog	2005-06-17 20:25:45.000000000 +0200
@@ -196,7 +196,7 @@
     19990819   Alan Cox <alan@redhat.com>
                Tested Zoltan's changes on a pre production Athlon - 100%
                success.
-    19991008   Manfred Spraul <manfreds@colorfullife.com>
+    19991008   Manfred Spraul <manfred@colorfullife.com>
     	       replaced spin_lock_reschedule() with a normal semaphore.
   v1.36
     20000221   Richard Gooch <rgooch@atnf.csiro.au>
--- linux-2.6-mm/arch/i386/kernel/vm86.c.orig	2005-06-17 20:24:06.000000000 +0200
+++ linux-2.6-mm/arch/i386/kernel/vm86.c	2005-06-17 20:25:56.000000000 +0200
@@ -4,7 +4,7 @@
  *  Copyright (C) 1994  Linus Torvalds
  *
  *  29 dec 2001 - Fixed oopses caused by unchecked access to the vm86
- *                stack - Manfred Spraul <manfreds@colorfullife.com>
+ *                stack - Manfred Spraul <manfred@colorfullife.com>
  *
  *  22 mar 2002 - Manfred detected the stackfaults, but didn't handle
  *                them correctly. Now the emulation will be in a
--- linux-2.6-mm/kernel/printk.c.orig	2005-06-17 20:24:13.000000000 +0200
+++ linux-2.6-mm/kernel/printk.c	2005-06-17 20:26:32.000000000 +0200
@@ -11,7 +11,7 @@
  * Ted Ts'o, 2/11/93.
  * Modified for sysctl support, 1/8/97, Chris Horn.
  * Fixed SMP synchronization, 08/08/99, Manfred Spraul 
- *     manfreds@colorfullife.com
+ *     manfred@colorfullife.com
  * Rewrote bits to get rid of console_lock
  *	01Mar01 Andrew Morton <andrewm@uow.edu.au>
  */