Remove obsolete e-mail address
diff --git a/Demo/curses/life.py b/Demo/curses/life.py
index b4797bf..37d36e8 100755
--- a/Demo/curses/life.py
+++ b/Demo/curses/life.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# life.py -- A curses-based version of Conway's Game of Life.
-# Contributed by A.M. Kuchling <amk1@bigfoot.com>
+# Contributed by AMK
#
# An empty board will be displayed, and the following commands are available:
# E : Erase the board
diff --git a/Doc/whatsnew/whatsnew20.tex b/Doc/whatsnew/whatsnew20.tex
index 4817dcf..229f9ee 100644
--- a/Doc/whatsnew/whatsnew20.tex
+++ b/Doc/whatsnew/whatsnew20.tex
@@ -5,7 +5,7 @@
\title{What's New in Python 2.0}
\release{1.01}
\author{A.M. Kuchling and Moshe Zadka}
-\authoraddress{\email{amk1@bigfoot.com}, \email{moshez@math.huji.ac.il} }
+\authoraddress{\email{akuchlin@mems-exchange.org}, \email{moshez@math.huji.ac.il} }
\begin{document}
\maketitle\tableofcontents
diff --git a/Doc/whatsnew/whatsnew21.tex b/Doc/whatsnew/whatsnew21.tex
index 4a5ad7f..d296f4c 100644
--- a/Doc/whatsnew/whatsnew21.tex
+++ b/Doc/whatsnew/whatsnew21.tex
@@ -7,7 +7,7 @@
\title{What's New in Python 2.1}
\release{1.00}
\author{A.M. Kuchling}
-\authoraddress{\email{amk1@bigfoot.com}}
+\authoraddress{\email{akuchlin@mems-exchange.org}}
\begin{document}
\maketitle\tableofcontents
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index d5bc89f..8d57e90 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1,6 +1,6 @@
/*
/ Author: Sam Rushing <rushing@nightmare.com>
- / Hacked for Unix by A.M. Kuchling <amk1@bigfoot.com>
+ / Hacked for Unix by AMK
/ $Id$
/ mmapmodule.cpp -- map a view of a file into memory